diff options
| author | Brave Galera Crew <devel@codership.com> | 2019-01-23 15:30:00 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-01-23 15:30:00 +0400 |
| commit | 36a2a185fe18d31a644da46cfabd9757a379280c (patch) | |
| tree | 00ca186ce2cfdc3ab7e4979336a384e2b51c5aa9 /sql/sql_load.cc | |
| parent | 382115b99297ceaa4c3067f79efb5c2515013be5 (diff) | |
| download | mariadb-git-36a2a185fe18d31a644da46cfabd9757a379280c.tar.gz | |
Galera4
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index dd6e723c953..c95ef72a308 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -42,6 +42,8 @@ #include "sql_derived.h" #include "sql_show.h" +#include "wsrep_mysqld.h" + extern "C" int _my_b_net_read(IO_CACHE *info, uchar *Buffer, size_t Count); class XML_TAG { @@ -106,7 +108,7 @@ static bool wsrep_load_data_split(THD *thd, const TABLE *table, { DBUG_ENTER("wsrep_load_data_split"); - if (!wsrep_load_data_splitting || !wsrep_on(thd) + if (!wsrep_load_data_splitting || !WSREP(thd) || !info.records || (info.records % 10000) || !thd->transaction.stmt.ha_list || thd->transaction.stmt.ha_list->ht() != binlog_hton @@ -116,13 +118,10 @@ static bool wsrep_load_data_split(THD *thd, const TABLE *table, if (handlerton* hton= thd->transaction.stmt.ha_list->next()->ht()) { - if (hton->db_type != DB_TYPE_INNODB) + if (!(hton->flags & HTON_WSREP_REPLICATION)) DBUG_RETURN(false); WSREP_DEBUG("intermediate transaction commit in LOAD DATA"); - if (wsrep_run_wsrep_commit(thd, true) != WSREP_TRX_OK) DBUG_RETURN(true); - if (binlog_hton->commit(binlog_hton, thd, true)) DBUG_RETURN(true); - wsrep_post_commit(thd, true); - hton->commit(hton, thd, true); + wsrep_tc_log_commit(thd); table->file->extra(HA_EXTRA_FAKE_START_STMT); } |