diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
| commit | b006d2ead4640f0ab4e29687fd7d24988b1c98f1 (patch) | |
| tree | a478984bcd7f4bb2e0fd0496eae77b871077a380 /sql/sql_admin.cc | |
| parent | b782971c58b5656820429b8ef3fae5fd82f5a0f7 (diff) | |
| parent | dc09f8f29cb2b9fdce7d5d5a623fdc8dcf1814f9 (diff) | |
| download | mariadb-git-b006d2ead4640f0ab4e29687fd7d24988b1c98f1.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 6c56e4c1010..4cff69060d1 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -703,8 +703,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, if (lock_type == TL_WRITE && !table->table->s->tmp_table && table->mdl_request.type > MDL_SHARED_WRITE) { - if (wait_while_table_is_used(thd, table->table, - HA_EXTRA_PREPARE_FOR_RENAME)) + if (wait_while_table_is_used(thd, table->table, HA_EXTRA_NOT_USED)) goto err; DEBUG_SYNC(thd, "after_admin_flush"); /* Flush entries in the query cache involving this table. */ @@ -1042,7 +1041,7 @@ send_result_message: if (!thd->open_temporary_tables(table) && (table->table= open_ltable(thd, table, lock_type, 0))) { - uint save_flags; + ulonglong save_flags; /* Store the original value of alter_info->flags */ save_flags= alter_info->flags; |