diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
| commit | 5a92ccbaea1bb3973e23846a741f5694a1e687bd (patch) | |
| tree | aafc504552502b48b79cadcb06b2b5c7eba4f374 /storage/innobase/row/row0log.cc | |
| parent | c997af7d1f432dfca922958453f0e2313287f1eb (diff) | |
| parent | c016ea660ede8b7ff75f8ca65f73e2958262263a (diff) | |
| download | mariadb-git-5a92ccbaea1bb3973e23846a741f5694a1e687bd.tar.gz | |
Merge 10.3 into 10.4
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
Diffstat (limited to 'storage/innobase/row/row0log.cc')
| -rw-r--r-- | storage/innobase/row/row0log.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index fb0a376dd34..caffeab6af0 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -1722,7 +1722,7 @@ row_log_table_apply_insert_low( error = row_ins_clust_index_entry_low( flags, BTR_MODIFY_TREE, index, index->n_uniq, - entry, 0, thr, false); + entry, 0, thr); switch (error) { case DB_SUCCESS: @@ -1746,7 +1746,7 @@ row_log_table_apply_insert_low( error = row_ins_sec_index_entry_low( flags, BTR_MODIFY_TREE, index, offsets_heap, heap, entry, - thr_get_trx(thr)->id, thr, false); + thr_get_trx(thr)->id, thr); if (error != DB_SUCCESS) { if (error == DB_DUPLICATE_KEY) { @@ -2377,7 +2377,7 @@ func_exit_committed: BTR_CREATE_FLAG | BTR_NO_LOCKING_FLAG | BTR_NO_UNDO_LOG_FLAG | BTR_KEEP_SYS_FLAG, BTR_MODIFY_TREE, index, offsets_heap, heap, - entry, thr_get_trx(thr)->id, thr, false); + entry, thr_get_trx(thr)->id, thr); /* Report correct index name for duplicate key error. */ if (error == DB_DUPLICATE_KEY) { |