Skip to content

M
mariadb
Commit e6d79d40 authored by marko's avatar marko
Browse files
Options

branches/innodb+: Merge revisions 2676:2678 from branches/zip.

parent 211417e2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
row/row0umod.c
View file @ e6d79d40
...@@ -429,15 +429,15 @@ row_undo_mod_del_unmark_sec_and_undo_update( ...@@ -429,15 +429,15 @@ row_undo_mod_del_unmark_sec_and_undo_update(
mtr_t mtr; mtr_t mtr;
trx_t* trx = thr_get_trx(thr); trx_t* trx = thr_get_trx(thr);
log_free_check();
mtr_start(&mtr);
/* Ignore indexes that are being created. */ /* Ignore indexes that are being created. */
if (UNIV_UNLIKELY(*index->name == TEMP_INDEX_PREFIX)) { if (UNIV_UNLIKELY(*index->name == TEMP_INDEX_PREFIX)) {
return(DB_SUCCESS); return(DB_SUCCESS);
} }
log_free_check();
mtr_start(&mtr);
if (UNIV_UNLIKELY(!row_search_index_entry(NULL, index, entry, if (UNIV_UNLIKELY(!row_search_index_entry(NULL, index, entry,
mode, &pcur, &mtr))) { mode, &pcur, &mtr))) {
fputs("InnoDB: error in sec index entry del undo in\n" fputs("InnoDB: error in sec index entry del undo in\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7