Merge branch 'master' into releases/tokudb-7.5

10 files changed, 4 insertions, 1 deletions

diff --git a/doc/sysbench.update.ma10.tokudb754.loglog.png b/doc/sysbench.update.ma10.tokudb754.loglog.png
new file mode 100644
index 00000000000..99b15ff642f
--- /dev/null
+++ b/doc/sysbench.update.ma10.tokudb754.loglog.png
diff --git a/doc/sysbench.update.ma10.tokudb754.png b/doc/sysbench.update.ma10.tokudb754.png
new file mode 100644
index 00000000000..7297013b51f
--- /dev/null
+++ b/doc/sysbench.update.ma10.tokudb754.png
diff --git a/doc/sysbench.update.ma55.tokudb753.binlog.png b/doc/sysbench.update.ma55.tokudb753.binlog.png
new file mode 100644
index 00000000000..510f1811e5a
--- /dev/null
+++ b/doc/sysbench.update.ma55.tokudb753.binlog.png
diff --git a/doc/sysbench.update.ma55.tokudb753.loglog.png b/doc/sysbench.update.ma55.tokudb753.loglog.png
new file mode 100644
index 00000000000..81fecd37684
--- /dev/null
+++ b/doc/sysbench.update.ma55.tokudb753.loglog.png
diff --git a/doc/sysbench.update.ma55.tokudb753.png b/doc/sysbench.update.ma55.tokudb753.png
new file mode 100644
index 00000000000..e5ed5f90b63
--- /dev/null
+++ b/doc/sysbench.update.ma55.tokudb753.png
diff --git a/doc/sysbench.update.my55.tokudb753.loglog.png b/doc/sysbench.update.my55.tokudb753.loglog.png
new file mode 100644
index 00000000000..1fe55b07b19
--- /dev/null
+++ b/doc/sysbench.update.my55.tokudb753.loglog.png
diff --git a/doc/sysbench.update.ps56.tokudb754.loglog.png b/doc/sysbench.update.ps56.tokudb754.loglog.png
new file mode 100644
index 00000000000..52985276249
--- /dev/null
+++ b/doc/sysbench.update.ps56.tokudb754.loglog.png
diff --git a/doc/sysbench.update.ps56.tokudb754.png b/doc/sysbench.update.ps56.tokudb754.png
new file mode 100644
index 00000000000..39b1c591730
--- /dev/null
+++ b/doc/sysbench.update.ps56.tokudb754.png
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index 578b6c01856..07046fd6340 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -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;
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc
index 1a03dc815a1..cae50446fa0 100644
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
@@ -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);