1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2020-05-26 11:54:55 +03:00
47 changed files with 1104 additions and 347 deletions

View File

@ -1090,7 +1090,7 @@ send_result_message:
}
/* Make sure this table instance is not reused after the operation. */
if (table->table)
table->table->m_needs_reopen= true;
table->table->mark_table_for_reopen();
}
result_code= result_code ? HA_ADMIN_FAILED : HA_ADMIN_OK;
table->next_local= save_next_local;
@ -1215,7 +1215,7 @@ err:
trans_rollback(thd);
if (table && table->table)
{
table->table->m_needs_reopen= true;
table->table->mark_table_for_reopen();
table->table= 0;
}
close_thread_tables(thd); // Shouldn't be needed