Commit b9d154c5 authored by Rich Prohaska's avatar Rich Prohaska

DB-766 use an extra flag that is supported on MySQL and does not require a...

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
parent 09f905c5
...@@ -5981,6 +5981,7 @@ int ha_tokudb::extra(enum ha_extra_function operation) { ...@@ -5981,6 +5981,7 @@ int ha_tokudb::extra(enum ha_extra_function operation) {
using_ignore_no_key = false; using_ignore_no_key = false;
break; break;
case HA_EXTRA_NOT_USED: case HA_EXTRA_NOT_USED:
case HA_EXTRA_PREPARE_FOR_RENAME:
break; // must do nothing and return 0 break; // must do nothing and return 0
default: default:
break; break;
......
...@@ -765,7 +765,9 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i ...@@ -765,7 +765,9 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
#else #else
THD::killed_state saved_killed_state = thd->killed; THD::killed_state saved_killed_state = thd->killed;
thd->killed = THD::NOT_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) if (thd->killed != THD::NOT_KILLED)
thd->killed = THD::NOT_KILLED; thd->killed = THD::NOT_KILLED;
sleep(1); sleep(1);
......
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