diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-04 10:24:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-04 10:24:10 +0300 |
| commit | eba2d10ac53d1d2f975027ba2b2ca39d9c9b98ad (patch) | |
| tree | 7389791492884dd232c5ddc84e53e70a0a725770 /storage/innobase/row/row0mysql.cc | |
| parent | ad2bf1129cfa85c00072b46e0355fe14bf69ee54 (diff) | |
| download | mariadb-git-eba2d10ac53d1d2f975027ba2b2ca39d9c9b98ad.tar.gz | |
MDEV-22721 Remove bloat caused by InnoDB logger class
Introduce a new ATTRIBUTE_NOINLINE to
ib::logger member functions, and add UNIV_UNLIKELY hints to callers.
Also, remove some crash reporting output. If needed, the
information will be available using debugging tools.
Furthermore, remove some fts_enable_diag_print output that included
indexed words in raw form. The code seemed to assume that words are
NUL-terminated byte strings. It is not clear whether a NUL terminator
is always guaranteed to be present. Also, UCS2 or UTF-16 strings would
typically contain many NUL bytes.
Diffstat (limited to 'storage/innobase/row/row0mysql.cc')
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 9bbd531cb9a..d3efc5fc256 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -782,8 +782,7 @@ handle_new_error: " foreign constraints and try again"; goto rollback_to_savept; default: - ib::fatal() << "Unknown error code " << err << ": " - << ut_strerr(err); + ib::fatal() << "Unknown error " << err; } if (trx->error_state != DB_SUCCESS) { @@ -3161,10 +3160,10 @@ row_drop_ancillary_fts_tables( dberr_t err = fts_drop_tables(trx, table); - if (err != DB_SUCCESS) { + if (UNIV_UNLIKELY(err != DB_SUCCESS)) { ib::error() << " Unable to remove ancillary FTS" " tables for table " - << table->name << " : " << ut_strerr(err); + << table->name << " : " << err; return(err); } @@ -4009,10 +4008,10 @@ loop: table_name, trx, SQLCOM_DROP_DB); trx_commit_for_mysql(trx); - if (err != DB_SUCCESS) { + if (UNIV_UNLIKELY(err != DB_SUCCESS)) { ib::error() << "DROP DATABASE " << ut_get_name(trx, name) << " failed" - " with error (" << ut_strerr(err) << ") for" + " with error (" << err << ") for" " table " << ut_get_name(trx, table_name); ut_free(table_name); break; |