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

Merge branch 'develop' into develop-merge-up-20190729

Browse Source
This commit is contained in:
Andrew Hutchings
2019-08-09 14:01:11 +01:00
committed by GitHub
parent 83a8924229 a1d1bd7392
commit 7af9771319
23 changed files with 2612 additions and 2276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -2110,10 +2110,6 @@ int ha_calpont_impl_commit_ (handlerton* hton, THD* thd, bool all, cal_connectio
{
int rc = 0;
if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_ALTER_VTABLE ||
thd->infinidb_vtable.vtable_state == THD::INFINIDB_SELECT_VTABLE )
return rc;
if (thd->slave_thread && !ci.replicationEnabled)
return 0;