Fix regression on galera.partition test case by commenting the proble…

…matic condition.
MariaDB · Jul 24, 2017 · 2aaed44 · 2aaed44
1 parent 07f8360
commit 2aaed44
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -6000,13 +6000,22 @@ ha_innobase::write_row(
 						   prebuilt->table->flags,
 						   user_thd);
 #ifdef WITH_WSREP
+	fprintf(stderr, "JAN: split %d load %d\n", wsrep_load_data_splitting,
+		sql_command == SQLCOM_LOAD);
 	if (!error_result
 	    && wsrep_on(user_thd)
 	    && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE
 	    && !wsrep_consistency_check(user_thd)
-	    && (sql_command != SQLCOM_CREATE_TABLE)
-	    && (sql_command != SQLCOM_LOAD ||
-		thd_binlog_format(user_thd) == BINLOG_FORMAT_ROW)) {
+	    && (sql_command != SQLCOM_CREATE_TABLE)) {
+		/* This change part of commit
+		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)) {
 			DBUG_PRINT("wsrep", ("row key failed"));