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

Merge branch 'develop-1.1' into merge-up-dev

Browse Source
This commit is contained in:
Andrew Hutchings
2017-11-24 11:10:09 +02:00
parent a347a8f5aa 573d465a75
commit 932819ba23
50 changed files with 1070 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -3345,8 +3345,8 @@ int ha_calpont_impl_rnd_end(TABLE* table)
return rc;
}
if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_REDO_PHASE1 && thd->infinidb_vtable.mysql_optimizer_off)
return rc;
// if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_REDO_PHASE1)
// return rc;
if ( (thd->lex)->sql_command == SQLCOM_ALTER_TABLE )
return rc;
@ -3363,7 +3363,7 @@ int ha_calpont_impl_rnd_end(TABLE* table)
// @bug 4022. error handling for select part of dml
if (ci->cal_conn_hndl && ci->rc)
{
// send ExeMgr a signal before cloing the connection
// send ExeMgr a signal before closing the connection
ByteStream msg;
ByteStream::quadbyte qb = 0;
msg << qb;