summaryrefslogtreecommitdiff
path: root/storage/innobase/include/btr0pcur.ic
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-04 10:24:10 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-04 10:24:10 +0300
commiteba2d10ac53d1d2f975027ba2b2ca39d9c9b98ad (patch)
tree7389791492884dd232c5ddc84e53e70a0a725770 /storage/innobase/include/btr0pcur.ic
parentad2bf1129cfa85c00072b46e0355fe14bf69ee54 (diff)
downloadmariadb-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/include/btr0pcur.ic')
-rw-r--r--storage/innobase/include/btr0pcur.ic2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index b5b57050832..6bc5b356dab 100644
--- a/storage/innobase/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
@@ -458,7 +458,7 @@ btr_pcur_open_low(
index, level, tuple, mode, latch_mode,
btr_cursor, 0, file, line, mtr, autoinc);
- if (err != DB_SUCCESS) {
+ if (UNIV_UNLIKELY(err != DB_SUCCESS)) {
ib::warn() << " Error code: " << err
<< " btr_pcur_open_low "
<< " level: " << level