From 0898ccfeb4cb8a4b41ca4cd972b28d4ab3412d35 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 26 Mar 2014 17:06:10 +0400 Subject: [PATCH] dbms: fixed merging errors [METR-10071] --- dbms/src/Interpreters/InterpreterCreateQuery.cpp | 2 +- dbms/src/Storages/ITableDeclaration.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp index 6a05b4127e2..ee2cd8d004a 100644 --- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp +++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp @@ -237,7 +237,7 @@ StoragePtr InterpreterCreateQuery::execute(bool assume_metadata_exists) if (create.is_temporary) { - res->drop_on_destroy = true; + res->is_dropped = true; context.getSessionContext().addExternalTable(table_name, res); } else diff --git a/dbms/src/Storages/ITableDeclaration.cpp b/dbms/src/Storages/ITableDeclaration.cpp index 9145faced2f..abf21a3ccbf 100644 --- a/dbms/src/Storages/ITableDeclaration.cpp +++ b/dbms/src/Storages/ITableDeclaration.cpp @@ -10,7 +10,7 @@ namespace DB { -bool IStorage::hasRealColumn(const String &column_name) const +bool ITableDeclaration::hasRealColumn(const String &column_name) const { const NamesAndTypesList & real_columns = getColumnsList(); for (auto & it : real_columns)