database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-1325 rename table fails when database different than current database

Browse Source
This commit is contained in:
David Hall
2018-04-04 15:56:53 -05:00
parent aa73a99350
commit fa43a962a8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbcon/mysql/ha_calpont_ddl.cpp
View File

@@ -2074,16 +2074,14 @@ int ha_calpont_impl_rename_table_(const char* from, const char* to, cal_connecti
stmt = stmt1.str(); stmt = stmt1.str();
string db; string db;
if ( thd->db ) if ( fromPair.first.length() !=0 )
db = thd->db;
else if ( fromPair.first.length() !=0 )
db = fromPair.first; db = fromPair.first;
else else if ( thd->db )
db = toPair.first; db = thd->db;
int rc = ProcessDDLStatement(stmt, db, "", tid2sid(thd->thread_id), emsg); int rc = ProcessDDLStatement(stmt, db, "", tid2sid(thd->thread_id), emsg);
if (rc != 0) if (rc != 0)
push_warning(thd, Sql_condition::WARN_LEVEL_ERROR, 9999, emsg.c_str()); push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str());
return rc; return rc;
} }