diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
| commit | 6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89 (patch) | |
| tree | ade4c0b2e50538438e70dc49581541de94098625 /storage/innobase/row/row0upd.cc | |
| parent | 374f94c5a749ec6af83824c1f55f0f49029a9714 (diff) | |
| parent | 68d9d512e933a1d40670add50f205e5266bc5507 (diff) | |
| download | mariadb-git-6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row/row0upd.cc')
| -rw-r--r-- | storage/innobase/row/row0upd.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index c52e503237a..894ee3e1e0c 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2156,7 +2156,7 @@ row_upd_sec_index_entry( err = DB_SUCCESS; break; case DB_LOCK_WAIT: - if (wsrep_debug) { + if (UNIV_UNLIKELY(wsrep_debug)) { ib::warn() << "WSREP: sec index FK lock wait" << " index " << index->name << " table " << index->table->name @@ -2164,7 +2164,7 @@ row_upd_sec_index_entry( } break; case DB_DEADLOCK: - if (wsrep_get_debug()) { + if (UNIV_UNLIKELY(wsrep_debug)) { ib::warn() << "WSREP: sec index FK check fail for deadlock" << " index " << index->name << " table " << index->table->name @@ -2172,7 +2172,7 @@ row_upd_sec_index_entry( } break; default: - ib::error() << "WSREP: referenced FK check fail: " << ut_strerr(err) + ib::error() << "WSREP: referenced FK check fail: " << err << " index " << index->name << " table " << index->table->name << " query " << wsrep_thd_query(trx->mysql_thd); @@ -2482,14 +2482,14 @@ check_fk: err = DB_SUCCESS; break; case DB_DEADLOCK: - if (wsrep_get_debug()) { + if (UNIV_UNLIKELY(wsrep_debug)) { ib::warn() << "WSREP: sec index FK check fail for deadlock" << " index " << index->name << " table " << index->table->name; } goto err_exit; default: - ib::error() << "WSREP: referenced FK check fail: " << ut_strerr(err) + ib::error() << "WSREP: referenced FK check fail: " << err << " index " << index->name << " table " << index->table->name; goto err_exit; @@ -2707,14 +2707,14 @@ row_upd_del_mark_clust_rec( err = DB_SUCCESS; break; case DB_DEADLOCK: - if (wsrep_get_debug()) { + if (UNIV_UNLIKELY(wsrep_debug)) { ib::warn() << "WSREP: sec index FK check fail for deadlock" << " index " << index->name << " table " << index->table->name; } break; default: - ib::error() << "WSREP: referenced FK check fail: " << ut_strerr(err) + ib::error() << "WSREP: referenced FK check fail: " << err << " index " << index->name << " table " << index->table->name; |