diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:38:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:38:03 +0100 |
| commit | 2a4e4335c4bcb7f7488c9b91bdc8a2da3da5cf61 (patch) | |
| tree | eadf9e2e8c0d2fccdd1db226395b8232b67737d6 /storage | |
| parent | 7002291b8aa2e036a7adfd23d961dc09b4f01f46 (diff) | |
| parent | 9572bbdc3791178b82d4c71a8e3948a3a35123d4 (diff) | |
| download | mariadb-git-2a4e4335c4bcb7f7488c9b91bdc8a2da3da5cf61.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 11 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/row/row0ins.cc | 11 |
3 files changed, 10 insertions, 13 deletions
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 84f61956c47..acbffb3a386 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -1291,12 +1291,11 @@ row_ins_foreign_check_on_constraint( #ifdef WITH_WSREP err = wsrep_append_foreign_key( - thr_get_trx(thr), - foreign, - clust_rec, - clust_index, - FALSE, - (node) ? TRUE : FALSE); + thr_get_trx(thr), + foreign, + clust_rec, + clust_index, + FALSE, FALSE); if (err != DB_SUCCESS) { fprintf(stderr, "WSREP: foreign key append failed: %d\n", err); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 9baf85ab858..1cd0b6ede51 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -2435,4 +2435,3 @@ trx_start_for_ddl_low( ut_error; } - diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc index e8bae7427f4..62e194020bc 100644 --- a/storage/xtradb/row/row0ins.cc +++ b/storage/xtradb/row/row0ins.cc @@ -1297,12 +1297,11 @@ row_ins_foreign_check_on_constraint( #ifdef WITH_WSREP err = wsrep_append_foreign_key( - thr_get_trx(thr), - foreign, - clust_rec, - clust_index, - FALSE, - (node) ? TRUE : FALSE); + thr_get_trx(thr), + foreign, + clust_rec, + clust_index, + FALSE, FALSE); if (err != DB_SUCCESS) { fprintf(stderr, "WSREP: foreign key append failed: %d\n", err); |