thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: fixed merging errors [METR-10071]

Browse Source
This commit is contained in:
Sergey Fedorov 2014-03-26 17:06:10 +04:00
parent eda2a1590b
commit 0898ccfeb4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -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

2
dbms/src/Storages/ITableDeclaration.cpp
View File

@ -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)