diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 11:01:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 11:01:47 +0300 |
| commit | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (patch) | |
| tree | e1e69ba81d7dd1b170b8572edc6e7625b38567b8 /storage/innobase/row/row0mysql.cc | |
| parent | f8bf5b0f8431493975f8f4488d0bef6e0e4e289e (diff) | |
| parent | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (diff) | |
| download | mariadb-git-2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row/row0mysql.cc')
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index ac5986243d6..86cdf1995db 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -3811,7 +3811,7 @@ funct_exit_all_freed: trx->op_info = ""; - srv_inc_activity_count(); + srv_wake_master_thread(); DBUG_RETURN(err); } @@ -4522,12 +4522,20 @@ end: if (err != DB_SUCCESS) { if (old_is_tmp) { - ib::error() << "In ALTER TABLE " + /* In case of copy alter, ignore the + loading of foreign key constraint + when foreign_key_check is disabled */ + ib::error_or_warn(trx->check_foreigns) + << "In ALTER TABLE " << ut_get_name(trx, new_name) << " has or is referenced in foreign" " key constraints which are not" " compatible with the new table" " definition."; + if (!trx->check_foreigns) { + err = DB_SUCCESS; + goto funct_exit; + } } else { ib::error() << "In RENAME TABLE table " << ut_get_name(trx, new_name) |