Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä 2020-06-05 16:51:26 +03:00
commit 680463a8d9
55 changed files with 638 additions and 558 deletions

View file

@ -445,14 +445,14 @@ btr_pcur_open_low(
#endif /* BTR_CUR_HASH_ADAPT */
file, line, mtr, autoinc);
if (err != DB_SUCCESS) {
ib::warn() << " Error code: " << err
<< " btr_pcur_open_low "
if (UNIV_UNLIKELY(err != DB_SUCCESS)) {
ib::warn() << "btr_pcur_open_low"
<< " level: " << level
<< " called from file: "
<< file << " line: " << line
<< " table: " << index->table->name
<< " index: " << index->name;
<< " index: " << index->name
<< " error: " << err;
}
cursor->pos_state = BTR_PCUR_IS_POSITIONED;