1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression on galera.partition test case by commenting the problematic condition.

Browse Source
This commit is contained in:
Jan Lindström 2017-07-24 15:43:45 +03:00
parent 07f8360f17
commit 2aaed4489f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/innobase/handler/ha_innodb.cc
View File

@ -6000,13 +6000,22 @@ report_error:
prebuilt->table->flags, prebuilt->table->flags,
user_thd); user_thd);
#ifdef WITH_WSREP #ifdef WITH_WSREP
fprintf(stderr, "JAN: split %d load %d\n", wsrep_load_data_splitting,
sql_command == SQLCOM_LOAD);
if (!error_result if (!error_result
&& wsrep_on(user_thd) && wsrep_on(user_thd)
&& wsrep_thd_exec_mode(user_thd) == LOCAL_STATE && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE
&& !wsrep_consistency_check(user_thd) && !wsrep_consistency_check(user_thd)
&& (sql_command != SQLCOM_CREATE_TABLE) && (sql_command != SQLCOM_CREATE_TABLE)) {
&& (sql_command != SQLCOM_LOAD || /* This change part of commit
thd_binlog_format(user_thd) == BINLOG_FORMAT_ROW)) { a4bc8db216b4dd61ca0b1cb5a8b7806437416dc7
MW-322 - CTAS fix will cause regression on galera.partition
test case. Commented until galeracluster developers have
looked the issue.
&& (sql_command != SQLCOM_LOAD ||
thd_binlog_format(user_thd) ==
BINLOG_FORMAT_ROW)) {
*/
if (wsrep_append_keys(user_thd, false, record, NULL)) { if (wsrep_append_keys(user_thd, false, record, NULL)) {
DBUG_PRINT("wsrep", ("row key failed")); DBUG_PRINT("wsrep", ("row key failed"));