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-1.2' into develop-merge-up-20190425

Browse Source
This commit is contained in:
Andrew Hutchings
2019-04-25 10:27:59 +01:00
parent 240648e7d9 b8de456f1c
commit 784bbe09d4
37 changed files with 508 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -2080,7 +2080,8 @@ int ha_calpont_impl_commit_ (handlerton* hton, THD* thd, bool all, cal_connectio
thd->infinidb_vtable.vtable_state == THD::INFINIDB_SELECT_VTABLE )
return rc;
if (thd->slave_thread) return 0;
if (thd->slave_thread && !ci.replicationEnabled)
return 0;
std::string command("COMMIT");
#ifdef INFINIDB_DEBUG