Skip to content

M
MariaDB
Commit bf9d5b7f authored by Seppo Jaakola's avatar Seppo Jaakola
Browse files
Options

References: lp:1134892 MDEV-4624 - merged fix from LP wsrep-5.5-23

parent 71509626
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 38 deletions
storage/innobase/handler/ha_innodb.cc
View file @ bf9d5b7f
...@@ -7224,6 +7224,7 @@ wsrep_append_foreign_key( ...@@ -7224,6 +7224,7 @@ wsrep_append_foreign_key(
foreign->foreign_table->name) : foreign->foreign_table->name) :
foreign->foreign_table->name, sizeof(cache_key) - 1); foreign->foreign_table->name, sizeof(cache_key) - 1);
cache_key_len = strlen(cache_key); cache_key_len = strlen(cache_key);
#define WSREP_DEBUG_PRINT
#ifdef WSREP_DEBUG_PRINT #ifdef WSREP_DEBUG_PRINT
ulint j; ulint j;
fprintf(stderr, "FK parent key, table: %s %s len: %lu ", fprintf(stderr, "FK parent key, table: %s %s len: %lu ",
......
storage/innobase/row/row0ins.c
View file @ bf9d5b7f
...@@ -1077,19 +1077,21 @@ row_ins_foreign_check_on_constraint( ...@@ -1077,19 +1077,21 @@ row_ins_foreign_check_on_constraint(
cascade->state = UPD_NODE_UPDATE_CLUSTERED; cascade->state = UPD_NODE_UPDATE_CLUSTERED;
err = row_update_cascade_for_mysql(thr, cascade,
foreign->foreign_table);
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS) {
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, FALSE);
} if (err != DB_SUCCESS) {
#endif /* WITH_WSREP */ fprintf(stderr,
"WSREP: foreign key append failed: %lu\n", err);
} else
#endif
err = row_update_cascade_for_mysql(thr, cascade,
foreign->foreign_table);
if (foreign->foreign_table->n_foreign_key_checks_running == 0) { if (foreign->foreign_table->n_foreign_key_checks_running == 0) {
fprintf(stderr, fprintf(stderr,
"InnoDB: error: table %s has the counter 0" "InnoDB: error: table %s has the counter 0"
......
storage/innobase/row/row0upd.c
View file @ bf9d5b7f
...@@ -174,13 +174,47 @@ row_upd_index_is_referenced( ...@@ -174,13 +174,47 @@ row_upd_index_is_referenced(
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
ulint wsrep_append_foreign_key(trx_t *trx, static
dict_foreign_t* foreign, ibool
const rec_t* clust_rec, wsrep_row_upd_index_is_foreign(
dict_index_t* clust_index, /*========================*/
ibool referenced, dict_index_t* index, /*!< in: index */
ibool shared); trx_t* trx) /*!< in: transaction */
{
dict_table_t* table = index->table;
dict_foreign_t* foreign;
ibool froze_data_dict = FALSE;
ibool is_referenced = FALSE;
if (!UT_LIST_GET_FIRST(table->foreign_list)) {
return(FALSE);
}
if (trx->dict_operation_lock_mode == 0) {
row_mysql_freeze_data_dictionary(trx);
froze_data_dict = TRUE;
}
foreign = UT_LIST_GET_FIRST(table->foreign_list);
while (foreign) {
if (foreign->foreign_index == index) {
is_referenced = TRUE;
goto func_exit;
}
foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
}
func_exit:
if (froze_data_dict) {
row_mysql_unfreeze_data_dictionary(trx);
}
return(is_referenced);
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/*********************************************************************//** /*********************************************************************//**
...@@ -1757,6 +1791,9 @@ row_upd_sec_index_entry( ...@@ -1757,6 +1791,9 @@ row_upd_sec_index_entry(
if (!rec_get_deleted_flag( if (!rec_get_deleted_flag(
rec, dict_table_is_comp(index->table))) { rec, dict_table_is_comp(index->table))) {
#ifdef WITH_WSREP
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */
err = btr_cur_del_mark_set_sec_rec( err = btr_cur_del_mark_set_sec_rec(
0, btr_cur, TRUE, thr, &mtr); 0, btr_cur, TRUE, thr, &mtr);
...@@ -1775,7 +1812,11 @@ row_upd_sec_index_entry( ...@@ -1775,7 +1812,11 @@ 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 (err == DB_SUCCESS && !referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
wsrep_row_upd_index_is_foreign(index, trx)
) {
ulint* offsets = ulint* offsets =
rec_get_offsets( rec_get_offsets(
rec, index, NULL, ULINT_UNDEFINED, rec, index, NULL, ULINT_UNDEFINED,
...@@ -1966,6 +2007,9 @@ row_upd_clust_rec_by_insert( ...@@ -1966,6 +2007,9 @@ row_upd_clust_rec_by_insert(
rec_t* rec; rec_t* rec;
ulint* offsets = NULL; ulint* offsets = NULL;
#ifdef WITH_WSREP
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */
ut_ad(node); ut_ad(node);
ut_ad(dict_index_is_clust(index)); ut_ad(dict_index_is_clust(index));
...@@ -2043,7 +2087,11 @@ row_upd_clust_rec_by_insert( ...@@ -2043,7 +2087,11 @@ row_upd_clust_rec_by_insert(
} }
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!referenced) { if (!referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
wsrep_row_upd_index_is_foreign(index, trx)
) {
err = wsrep_row_upd_check_foreign_constraints( err = wsrep_row_upd_check_foreign_constraints(
node, pcur, table, index, offsets, thr, mtr); node, pcur, table, index, offsets, thr, mtr);
switch (err) { switch (err) {
...@@ -2270,6 +2318,7 @@ row_upd_del_mark_clust_rec( ...@@ -2270,6 +2318,7 @@ row_upd_del_mark_clust_rec(
ulint err; ulint err;
#ifdef WITH_WSREP #ifdef WITH_WSREP
rec_t* rec; rec_t* rec;
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
ut_ad(node); ut_ad(node);
...@@ -2305,7 +2354,12 @@ row_upd_del_mark_clust_rec( ...@@ -2305,7 +2354,12 @@ row_upd_del_mark_clust_rec(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS && !referenced) { if (err == DB_SUCCESS && !referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
thr_get_trx(thr) &&
wsrep_row_upd_index_is_foreign(index, thr_get_trx(thr))
) {
err = wsrep_row_upd_check_foreign_constraints( err = wsrep_row_upd_check_foreign_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
switch (err) { switch (err) {
......
storage/xtradb/handler/ha_innodb.cc
View file @ bf9d5b7f
...@@ -8187,6 +8187,7 @@ wsrep_append_foreign_key( ...@@ -8187,6 +8187,7 @@ wsrep_append_foreign_key(
foreign->foreign_table->name) : foreign->foreign_table->name) :
foreign->foreign_table->name, sizeof(cache_key) - 1); foreign->foreign_table->name, sizeof(cache_key) - 1);
cache_key_len = strlen(cache_key); cache_key_len = strlen(cache_key);
#define WSREP_DEBUG_PRINT
#ifdef WSREP_DEBUG_PRINT #ifdef WSREP_DEBUG_PRINT
ulint j; ulint j;
fprintf(stderr, "FK parent key, table: %s %s len: %lu ", fprintf(stderr, "FK parent key, table: %s %s len: %lu ",
......
storage/xtradb/row/row0ins.c
View file @ bf9d5b7f
...@@ -1077,19 +1077,21 @@ row_ins_foreign_check_on_constraint( ...@@ -1077,19 +1077,21 @@ row_ins_foreign_check_on_constraint(
cascade->state = UPD_NODE_UPDATE_CLUSTERED; cascade->state = UPD_NODE_UPDATE_CLUSTERED;
err = row_update_cascade_for_mysql(thr, cascade,
foreign->foreign_table);
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS) {
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, FALSE);
} if (err != DB_SUCCESS) {
#endif /* WITH_WSREP */ fprintf(stderr,
"WSREP: foreign key append failed: %lu\n", err);
} else
#endif
err = row_update_cascade_for_mysql(thr, cascade,
foreign->foreign_table);
if (foreign->foreign_table->n_foreign_key_checks_running == 0) { if (foreign->foreign_table->n_foreign_key_checks_running == 0) {
fprintf(stderr, fprintf(stderr,
"InnoDB: error: table %s has the counter 0" "InnoDB: error: table %s has the counter 0"
......
storage/xtradb/row/row0upd.c
View file @ bf9d5b7f
...@@ -174,13 +174,47 @@ row_upd_index_is_referenced( ...@@ -174,13 +174,47 @@ row_upd_index_is_referenced(
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
ulint wsrep_append_foreign_key(trx_t *trx, static
dict_foreign_t* foreign, ibool
const rec_t* clust_rec, wsrep_row_upd_index_is_foreign(
dict_index_t* clust_index, /*========================*/
ibool referenced, dict_index_t* index, /*!< in: index */
ibool shared); trx_t* trx) /*!< in: transaction */
{
dict_table_t* table = index->table;
dict_foreign_t* foreign;
ibool froze_data_dict = FALSE;
ibool is_referenced = FALSE;
if (!UT_LIST_GET_FIRST(table->foreign_list)) {
return(FALSE);
}
if (trx->dict_operation_lock_mode == 0) {
row_mysql_freeze_data_dictionary(trx);
froze_data_dict = TRUE;
}
foreign = UT_LIST_GET_FIRST(table->foreign_list);
while (foreign) {
if (foreign->foreign_index == index) {
is_referenced = TRUE;
goto func_exit;
}
foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
}
func_exit:
if (froze_data_dict) {
row_mysql_unfreeze_data_dictionary(trx);
}
return(is_referenced);
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/*********************************************************************//** /*********************************************************************//**
...@@ -1776,6 +1810,9 @@ row_upd_sec_index_entry( ...@@ -1776,6 +1810,9 @@ row_upd_sec_index_entry(
if (!rec_get_deleted_flag( if (!rec_get_deleted_flag(
rec, dict_table_is_comp(index->table))) { rec, dict_table_is_comp(index->table))) {
#ifdef WITH_WSREP
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */
err = btr_cur_del_mark_set_sec_rec( err = btr_cur_del_mark_set_sec_rec(
0, btr_cur, TRUE, thr, &mtr); 0, btr_cur, TRUE, thr, &mtr);
...@@ -1794,7 +1831,11 @@ row_upd_sec_index_entry( ...@@ -1794,7 +1831,11 @@ 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 (err == DB_SUCCESS && !referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
wsrep_row_upd_index_is_foreign(index, trx)
) {
ulint* offsets = ulint* offsets =
rec_get_offsets( rec_get_offsets(
rec, index, NULL, ULINT_UNDEFINED, rec, index, NULL, ULINT_UNDEFINED,
...@@ -1985,6 +2026,9 @@ row_upd_clust_rec_by_insert( ...@@ -1985,6 +2026,9 @@ row_upd_clust_rec_by_insert(
rec_t* rec; rec_t* rec;
ulint* offsets = NULL; ulint* offsets = NULL;
#ifdef WITH_WSREP
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */
ut_ad(node); ut_ad(node);
ut_ad(dict_index_is_clust(index)); ut_ad(dict_index_is_clust(index));
...@@ -2064,7 +2108,11 @@ row_upd_clust_rec_by_insert( ...@@ -2064,7 +2108,11 @@ row_upd_clust_rec_by_insert(
} }
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!referenced) { if (!referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
wsrep_row_upd_index_is_foreign(index, trx)
) {
err = wsrep_row_upd_check_foreign_constraints( err = wsrep_row_upd_check_foreign_constraints(
node, pcur, table, index, offsets, thr, mtr); node, pcur, table, index, offsets, thr, mtr);
switch (err) { switch (err) {
...@@ -2296,6 +2344,7 @@ row_upd_del_mark_clust_rec( ...@@ -2296,6 +2344,7 @@ row_upd_del_mark_clust_rec(
ulint err; ulint err;
#ifdef WITH_WSREP #ifdef WITH_WSREP
rec_t* rec; rec_t* rec;
que_node_t *parent = que_node_get_parent(node);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
ut_ad(node); ut_ad(node);
...@@ -2331,7 +2380,12 @@ row_upd_del_mark_clust_rec( ...@@ -2331,7 +2380,12 @@ row_upd_del_mark_clust_rec(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (err == DB_SUCCESS && !referenced) { if (err == DB_SUCCESS && !referenced &&
!(parent && que_node_get_type(parent) == QUE_NODE_UPDATE &&
((upd_node_t*)parent)->cascade_node == node) &&
thr_get_trx(thr) &&
wsrep_row_upd_index_is_foreign(index, thr_get_trx(thr))
) {
err = wsrep_row_upd_check_foreign_constraints( err = wsrep_row_upd_check_foreign_constraints(
node, pcur, index->table, index, offsets, thr, mtr); node, pcur, index->table, index, offsets, thr, mtr);
switch (err) { switch (err) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7