revision-id: 067c444615c1e82a8d06fad0a528b97426436b87 (mariadb-10.3.6-215-g067c444615c) parent(s): 87a9ca2681fda2ed9f35dd78a0c6f66fe637eea1 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 14:15:35 +0200 message: Reduce diff on row0ins.cc --- storage/innobase/row/row0ins.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 340d158222e..129ace42cf2 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -44,10 +44,7 @@ Created 4/20/1996 Heikki Tuuri #include "buf0lru.h" #include "fts0fts.h" #include "fts0types.h" -#include "wsrep_api.h" -#include "mysql/service_wsrep.h" #include "wsrep_mysqld.h" -#include "mysql/service_wsrep.h" /************************************************************************* IMPORTANT NOTE: Any operation that generates redo MUST check that there @@ -1809,19 +1806,13 @@ row_ins_check_foreign_constraint( if (check_ref) { err = DB_SUCCESS; #ifdef WITH_WSREP - wsrep_key_type key_type; - if (upd_node != NULL) { - key_type = WSREP_KEY_SHARED; - } else { - key_type = WSREP_KEY_SEMI; - } err = wsrep_append_foreign_key( thr_get_trx(thr), foreign, rec, check_index, check_ref, - key_type); + upd_node != NULL ? WSREP_KEY_SHARED : WSREP_KEY_SEMI); #endif /* WITH_WSREP */ goto end_scan; } else if (foreign->type != 0) {