mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DB-766 use an extra flag that is supported on MySQL and does not require a tokutek patch to the wait_while_table_is_used function

Browse source
This commit is contained in:
Rich Prohaska 2014-12-21 19:15:39 -05:00
parent 09f905c57a
commit b9d154c564
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
storage/tokudb/ha_tokudb.cc
View file

@ -5981,6 +5981,7 @@ int ha_tokudb::extra(enum ha_extra_function operation) {
using_ignore_no_key = false;
break;
case HA_EXTRA_NOT_USED:
case HA_EXTRA_PREPARE_FOR_RENAME:
break; // must do nothing and return 0
default:
break;

4
storage/tokudb/ha_tokudb_alter_56.cc
View file

@ -765,7 +765,9 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
#else
THD::killed_state saved_killed_state = thd->killed;
thd->killed = THD::NOT_KILLED;
for (volatile uint i = 0; wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED); i++) {
// MySQL does not handle HA_EXTRA_NOT_USED so we use HA_EXTRA_PREPARE_FOR_RENAME since it is passed through
// the partition storage engine and is treated as a NOP by tokudb
for (volatile uint i = 0; wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_RENAME); i++) {
if (thd->killed != THD::NOT_KILLED)
thd->killed = THD::NOT_KILLED;
sleep(1);