mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into releases/tokudb-7.5

Browse source
This commit is contained in:
Rich Prohaska 2014-12-28 11:38:14 -05:00
commit 4197cc130b
10 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/sysbench.update.ma10.tokudb754.loglog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
doc/sysbench.update.ma10.tokudb754.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
doc/sysbench.update.ma55.tokudb753.binlog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
doc/sysbench.update.ma55.tokudb753.loglog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
doc/sysbench.update.ma55.tokudb753.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
doc/sysbench.update.my55.tokudb753.loglog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
doc/sysbench.update.ps56.tokudb754.loglog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
doc/sysbench.update.ps56.tokudb754.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.3 KiB

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);