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

Apply galera patches to XtraDB storage engine and remove one debug output.

Browse Source
This commit is contained in:
Jan Lindström 2017-07-24 16:14:27 +03:00
parent 2aaed4489f
commit eec6417e05
4 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6000,8 +6000,6 @@ 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

22
storage/xtradb/handler/ha_innodb.cc
View File

@ -7025,13 +7025,21 @@ report_error:
prebuilt->table->flags, prebuilt->table->flags,
user_thd); user_thd);
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!error_result && if (!error_result
wsrep_thd_exec_mode(user_thd) == LOCAL_STATE && && wsrep_on(user_thd)
wsrep_on(user_thd) && && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE
!wsrep_consistency_check(user_thd)) && !wsrep_consistency_check(user_thd)
{ && (sql_command != SQLCOM_CREATE_TABLE)) {
if (wsrep_append_keys(user_thd, false, record, NULL)) /* 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")); DBUG_PRINT("wsrep", ("row key failed"));
error_result = HA_ERR_INTERNAL_ERROR; error_result = HA_ERR_INTERNAL_ERROR;
goto wsrep_error; goto wsrep_error;

17
storage/xtradb/row/row0ins.c
View File

@ -1083,11 +1083,12 @@ row_ins_foreign_check_on_constraint(
#ifdef WITH_WSREP #ifdef WITH_WSREP
err = wsrep_append_foreign_key( err = wsrep_append_foreign_key(
thr_get_trx(thr), thr_get_trx(thr),
foreign, foreign,
clust_rec, clust_rec,
clust_index, clust_index,
FALSE, FALSE); FALSE,
(node) ? TRUE : FALSE);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
fprintf(stderr, fprintf(stderr,
"WSREP: foreign key append failed: %lu\n", err); "WSREP: foreign key append failed: %lu\n", err);
@ -1248,6 +1249,9 @@ row_ins_check_foreign_constraint(
ulint* offsets = offsets_; ulint* offsets = offsets_;
rec_offs_init(offsets_); rec_offs_init(offsets_);
#ifdef WITH_WSREP
upd_node= NULL;
#endif /* WITH_WSREP */
run_again: run_again:
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_SHARED)); ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_SHARED));
@ -1438,7 +1442,8 @@ run_again:
foreign, foreign,
rec, rec,
check_index, check_index,
check_ref, TRUE); check_ref,
(upd_node) ? TRUE : FALSE);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
goto end_scan; goto end_scan;
} else if (foreign->type != 0) { } else if (foreign->type != 0) {

4
storage/xtradb/row/row0upd.c
View File

@ -1842,7 +1842,9 @@ row_upd_sec_index_entry(
index, offsets, thr, &mtr); index, offsets, thr, &mtr);
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS && !referenced && if (wsrep_on(trx->mysql_thd) &&
!wsrep_thd_is_BF(trx->mysql_thd, FALSE) &&
err == DB_SUCCESS && !referenced &&
!(parent && que_node_get_type(parent) == !(parent && que_node_get_type(parent) ==
QUE_NODE_UPDATE && QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) && ((upd_node_t*)parent)->cascade_node == node) &&