move mysql-test into storage/tokudb, rename suites

1264 files changed, 0 insertions, 0 deletions

diff --git a/mysql-test/suite/tokudb/bulk-fetch-gen.py b/storage/tokudb/mysql-test/tokudb/bulk-fetch-gen.py
index f125ce771da..f125ce771da 100644
--- a/mysql-test/suite/tokudb/bulk-fetch-gen.py
+++ b/storage/tokudb/mysql-test/tokudb/bulk-fetch-gen.py
diff --git a/mysql-test/suite/tokudb/include/cluster_key.inc b/storage/tokudb/mysql-test/tokudb/include/cluster_key.inc
index dff54c432fb..dff54c432fb 100644
--- a/mysql-test/suite/tokudb/include/cluster_key.inc
+++ b/storage/tokudb/mysql-test/tokudb/include/cluster_key.inc
diff --git a/mysql-test/suite/tokudb/locks-blocking-row-locks-testgen.py b/storage/tokudb/mysql-test/tokudb/locks-blocking-row-locks-testgen.py
index 372431ada04..372431ada04 100644
--- a/mysql-test/suite/tokudb/locks-blocking-row-locks-testgen.py
+++ b/storage/tokudb/mysql-test/tokudb/locks-blocking-row-locks-testgen.py
diff --git a/mysql-test/suite/tokudb/r/auto_increment.result b/storage/tokudb/mysql-test/tokudb/r/auto_increment.result
index 8c596732847..8c596732847 100644
--- a/mysql-test/suite/tokudb/r/auto_increment.result
+++ b/storage/tokudb/mysql-test/tokudb/r/auto_increment.result
diff --git a/mysql-test/suite/tokudb/r/auto_increment_boundary.result b/storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary.result
index 914435293f6..914435293f6 100644
--- a/mysql-test/suite/tokudb/r/auto_increment_boundary.result
+++ b/storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary.result
diff --git a/mysql-test/suite/tokudb/r/auto_increment_boundary_traditional.result b/storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary_traditional.result
index b275a55f21a..b275a55f21a 100644
--- a/mysql-test/suite/tokudb/r/auto_increment_boundary_traditional.result
+++ b/storage/tokudb/mysql-test/tokudb/r/auto_increment_boundary_traditional.result
diff --git a/mysql-test/suite/tokudb/r/background_job_manager.result b/storage/tokudb/mysql-test/tokudb/r/background_job_manager.result
index c66872d7b0f..c66872d7b0f 100644
--- a/mysql-test/suite/tokudb/r/background_job_manager.result
+++ b/storage/tokudb/mysql-test/tokudb/r/background_job_manager.result
diff --git a/mysql-test/suite/tokudb/r/bf_create_select.result b/storage/tokudb/mysql-test/tokudb/r/bf_create_select.result
index c98bf2a4b78..c98bf2a4b78 100644
--- a/mysql-test/suite/tokudb/r/bf_create_select.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_create_select.result
diff --git a/mysql-test/suite/tokudb/r/bf_create_select_hash_part.result b/storage/tokudb/mysql-test/tokudb/r/bf_create_select_hash_part.result
index c352980124c..c352980124c 100644
--- a/mysql-test/suite/tokudb/r/bf_create_select_hash_part.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_create_select_hash_part.result
diff --git a/mysql-test/suite/tokudb/r/bf_create_select_range_part.result b/storage/tokudb/mysql-test/tokudb/r/bf_create_select_range_part.result
index 47e3ee7718a..47e3ee7718a 100644
--- a/mysql-test/suite/tokudb/r/bf_create_select_range_part.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_create_select_range_part.result
diff --git a/mysql-test/suite/tokudb/r/bf_create_temp_select.result b/storage/tokudb/mysql-test/tokudb/r/bf_create_temp_select.result
index 543bd795e2e..543bd795e2e 100644
--- a/mysql-test/suite/tokudb/r/bf_create_temp_select.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_create_temp_select.result
diff --git a/mysql-test/suite/tokudb/r/bf_delete.result b/storage/tokudb/mysql-test/tokudb/r/bf_delete.result
index e83b150c543..e83b150c543 100644
--- a/mysql-test/suite/tokudb/r/bf_delete.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_delete.result
diff --git a/mysql-test/suite/tokudb/r/bf_delete_trigger.result b/storage/tokudb/mysql-test/tokudb/r/bf_delete_trigger.result
index 78bd8d2fe14..78bd8d2fe14 100644
--- a/mysql-test/suite/tokudb/r/bf_delete_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_delete_trigger.result
diff --git a/mysql-test/suite/tokudb/r/bf_insert_select.result b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select.result
index 403e5ec5938..403e5ec5938 100644
--- a/mysql-test/suite/tokudb/r/bf_insert_select.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select.result
diff --git a/mysql-test/suite/tokudb/r/bf_insert_select_dup_key.result b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_dup_key.result
index a725c4d8aca..a725c4d8aca 100644
--- a/mysql-test/suite/tokudb/r/bf_insert_select_dup_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_dup_key.result
diff --git a/mysql-test/suite/tokudb/r/bf_insert_select_trigger.result b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_trigger.result
index 860d26602dd..860d26602dd 100644
--- a/mysql-test/suite/tokudb/r/bf_insert_select_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_trigger.result
diff --git a/mysql-test/suite/tokudb/r/bf_insert_select_update_trigger.result b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_update_trigger.result
index d7588441d92..d7588441d92 100644
--- a/mysql-test/suite/tokudb/r/bf_insert_select_update_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_insert_select_update_trigger.result
diff --git a/mysql-test/suite/tokudb/r/bf_replace_select.result b/storage/tokudb/mysql-test/tokudb/r/bf_replace_select.result
index a175797685c..a175797685c 100644
--- a/mysql-test/suite/tokudb/r/bf_replace_select.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_replace_select.result
diff --git a/mysql-test/suite/tokudb/r/bf_replace_select_trigger.result b/storage/tokudb/mysql-test/tokudb/r/bf_replace_select_trigger.result
index acd17170301..acd17170301 100644
--- a/mysql-test/suite/tokudb/r/bf_replace_select_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_replace_select_trigger.result
diff --git a/mysql-test/suite/tokudb/r/bf_select_hash_part.result b/storage/tokudb/mysql-test/tokudb/r/bf_select_hash_part.result
index 2c72c7129db..2c72c7129db 100644
--- a/mysql-test/suite/tokudb/r/bf_select_hash_part.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_select_hash_part.result
diff --git a/mysql-test/suite/tokudb/r/bf_select_range_part.result b/storage/tokudb/mysql-test/tokudb/r/bf_select_range_part.result
index cc6c16bc92a..cc6c16bc92a 100644
--- a/mysql-test/suite/tokudb/r/bf_select_range_part.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bf_select_range_part.result
diff --git a/mysql-test/suite/tokudb/r/bulk-fetch.result b/storage/tokudb/mysql-test/tokudb/r/bulk-fetch.result
index fe37684052b..fe37684052b 100644
--- a/mysql-test/suite/tokudb/r/bulk-fetch.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bulk-fetch.result
diff --git a/mysql-test/suite/tokudb/r/bulk-fetch2.result b/storage/tokudb/mysql-test/tokudb/r/bulk-fetch2.result
index 243ce486837..243ce486837 100644
--- a/mysql-test/suite/tokudb/r/bulk-fetch2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/bulk-fetch2.result
diff --git a/mysql-test/suite/tokudb/r/card_add_drop.result b/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result
index 71a39eb1f3e..71a39eb1f3e 100644
--- a/mysql-test/suite/tokudb/r/card_add_drop.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_add_drop.result
diff --git a/mysql-test/suite/tokudb/r/card_add_index.result b/storage/tokudb/mysql-test/tokudb/r/card_add_index.result
index 9a929b19a80..9a929b19a80 100644
--- a/mysql-test/suite/tokudb/r/card_add_index.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_add_index.result
diff --git a/mysql-test/suite/tokudb/r/card_auto_analyze_lots.result b/storage/tokudb/mysql-test/tokudb/r/card_auto_analyze_lots.result
index c665ef758a4..c665ef758a4 100644
--- a/mysql-test/suite/tokudb/r/card_auto_analyze_lots.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_auto_analyze_lots.result
diff --git a/mysql-test/suite/tokudb/r/card_drop_index.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result
index 2cfdfe11296..2cfdfe11296 100644
--- a/mysql-test/suite/tokudb/r/card_drop_index.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_index.result
diff --git a/mysql-test/suite/tokudb/r/card_drop_index_2.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result
index ed28d2a3226..ed28d2a3226 100644
--- a/mysql-test/suite/tokudb/r/card_drop_index_2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_index_2.result
diff --git a/mysql-test/suite/tokudb/r/card_drop_pk.result b/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result
index 2369d88c274..2369d88c274 100644
--- a/mysql-test/suite/tokudb/r/card_drop_pk.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_drop_pk.result
diff --git a/mysql-test/suite/tokudb/r/card_no_keys.result b/storage/tokudb/mysql-test/tokudb/r/card_no_keys.result
index 1302cfaf252..1302cfaf252 100644
--- a/mysql-test/suite/tokudb/r/card_no_keys.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_no_keys.result
diff --git a/mysql-test/suite/tokudb/r/card_pk.result b/storage/tokudb/mysql-test/tokudb/r/card_pk.result
index b0317507f7c..b0317507f7c 100644
--- a/mysql-test/suite/tokudb/r/card_pk.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_pk.result
diff --git a/mysql-test/suite/tokudb/r/card_pk_2.result b/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result
index 3c1b652db15..3c1b652db15 100644
--- a/mysql-test/suite/tokudb/r/card_pk_2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_pk_2.result
diff --git a/mysql-test/suite/tokudb/r/card_pk_sk.result b/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result
index 02c8d1f8218..02c8d1f8218 100644
--- a/mysql-test/suite/tokudb/r/card_pk_sk.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_pk_sk.result
diff --git a/mysql-test/suite/tokudb/r/card_scale_percent.result b/storage/tokudb/mysql-test/tokudb/r/card_scale_percent.result
index cfd7e38179c..cfd7e38179c 100644
--- a/mysql-test/suite/tokudb/r/card_scale_percent.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_scale_percent.result
diff --git a/mysql-test/suite/tokudb/r/card_sk.result b/storage/tokudb/mysql-test/tokudb/r/card_sk.result
index 310fc863a9b..310fc863a9b 100644
--- a/mysql-test/suite/tokudb/r/card_sk.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_sk.result
diff --git a/mysql-test/suite/tokudb/r/card_sk_2.result b/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result
index 8ff57b63e5d..8ff57b63e5d 100644
--- a/mysql-test/suite/tokudb/r/card_sk_2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_sk_2.result
diff --git a/mysql-test/suite/tokudb/r/card_unique_sk.result b/storage/tokudb/mysql-test/tokudb/r/card_unique_sk.result
index cbcab7bdc44..cbcab7bdc44 100644
--- a/mysql-test/suite/tokudb/r/card_unique_sk.result
+++ b/storage/tokudb/mysql-test/tokudb/r/card_unique_sk.result
diff --git a/mysql-test/suite/tokudb/r/change_column_all_1000_1.result b/storage/tokudb/mysql-test/tokudb/r/change_column_all_1000_1.result
index fdf593ac47b..fdf593ac47b 100644
--- a/mysql-test/suite/tokudb/r/change_column_all_1000_1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_all_1000_1.result
diff --git a/mysql-test/suite/tokudb/r/change_column_all_1000_10.result b/storage/tokudb/mysql-test/tokudb/r/change_column_all_1000_10.result
index 9df9380a134..9df9380a134 100644
--- a/mysql-test/suite/tokudb/r/change_column_all_1000_10.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_all_1000_10.result
diff --git a/mysql-test/suite/tokudb/r/change_column_auto_inc.result b/storage/tokudb/mysql-test/tokudb/r/change_column_auto_inc.result
index e3cb8bad5b5..e3cb8bad5b5 100644
--- a/mysql-test/suite/tokudb/r/change_column_auto_inc.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_auto_inc.result
diff --git a/mysql-test/suite/tokudb/r/change_column_bin.result b/storage/tokudb/mysql-test/tokudb/r/change_column_bin.result
index 2eee60143f9..2eee60143f9 100644
--- a/mysql-test/suite/tokudb/r/change_column_bin.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_bin.result
diff --git a/mysql-test/suite/tokudb/r/change_column_bin_descriptor.result b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_descriptor.result
index 4aed71257d1..4aed71257d1 100644
--- a/mysql-test/suite/tokudb/r/change_column_bin_descriptor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_descriptor.result
diff --git a/mysql-test/suite/tokudb/r/change_column_bin_key.result b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_key.result
index 3a694250058..3a694250058 100644
--- a/mysql-test/suite/tokudb/r/change_column_bin_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_key.result
diff --git a/mysql-test/suite/tokudb/r/change_column_bin_pad.result b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_pad.result
index 399bb56e9c5..399bb56e9c5 100644
--- a/mysql-test/suite/tokudb/r/change_column_bin_pad.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_pad.result
diff --git a/mysql-test/suite/tokudb/r/change_column_bin_rename.result b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_rename.result
index 864cb853b6b..864cb853b6b 100644
--- a/mysql-test/suite/tokudb/r/change_column_bin_rename.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_bin_rename.result
diff --git a/mysql-test/suite/tokudb/r/change_column_blob.result b/storage/tokudb/mysql-test/tokudb/r/change_column_blob.result
index 13b44257429..13b44257429 100644
--- a/mysql-test/suite/tokudb/r/change_column_blob.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_blob.result
diff --git a/mysql-test/suite/tokudb/r/change_column_blob_data.result b/storage/tokudb/mysql-test/tokudb/r/change_column_blob_data.result
index 07f11e73b30..07f11e73b30 100644
--- a/mysql-test/suite/tokudb/r/change_column_blob_data.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_blob_data.result
diff --git a/mysql-test/suite/tokudb/r/change_column_carchar_sum_cross256.result b/storage/tokudb/mysql-test/tokudb/r/change_column_carchar_sum_cross256.result
index 2d56f6b7319..2d56f6b7319 100644
--- a/mysql-test/suite/tokudb/r/change_column_carchar_sum_cross256.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_carchar_sum_cross256.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char.result
index 25bbfcfb71f..25bbfcfb71f 100644
--- a/mysql-test/suite/tokudb/r/change_column_char.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_binary.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_binary.result
index 7781a28b4d8..7781a28b4d8 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_binary.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_binary.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_charbinary.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_charbinary.result
index 82d5c32eca7..82d5c32eca7 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_charbinary.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_charbinary.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_charset.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_charset.result
index 1b2b8bfe936..1b2b8bfe936 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_charset.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_charset.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
index b32ea1498c1..b32ea1498c1 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_descriptor.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_descriptor.result
index 127955d4733..127955d4733 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_descriptor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_descriptor.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_key.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_key.result
index f5ab71db0db..f5ab71db0db 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_key.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_null.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_null.result
index e048f10df10..e048f10df10 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_null.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_null.result
diff --git a/mysql-test/suite/tokudb/r/change_column_char_rename.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_rename.result
index c6fae245138..c6fae245138 100644
--- a/mysql-test/suite/tokudb/r/change_column_char_rename.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_rename.result
diff --git a/mysql-test/suite/tokudb/r/change_column_delete_change_char_5674.result b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_char_5674.result
index b59b1163493..b59b1163493 100644
--- a/mysql-test/suite/tokudb/r/change_column_delete_change_char_5674.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_char_5674.result
diff --git a/mysql-test/suite/tokudb/r/change_column_delete_change_int_5674.result b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_int_5674.result
index 6beab5b9421..6beab5b9421 100644
--- a/mysql-test/suite/tokudb/r/change_column_delete_change_int_5674.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_int_5674.result
diff --git a/mysql-test/suite/tokudb/r/change_column_delete_change_varchar_5674.result b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_varchar_5674.result
index adaf532200c..adaf532200c 100644
--- a/mysql-test/suite/tokudb/r/change_column_delete_change_varchar_5674.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_delete_change_varchar_5674.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int.result
index c261cdf1ac6..c261cdf1ac6 100644
--- a/mysql-test/suite/tokudb/r/change_column_int.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
index 558d153711c..558d153711c 100644
--- a/mysql-test/suite/tokudb/r/change_column_int_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int_descriptor.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_descriptor.result
index 863a83c991b..863a83c991b 100644
--- a/mysql-test/suite/tokudb/r/change_column_int_descriptor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_descriptor.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int_key.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_key.result
index f0e34a9a463..f0e34a9a463 100644
--- a/mysql-test/suite/tokudb/r/change_column_int_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_key.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int_not_supported.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_not_supported.result
index 99d49dafa50..99d49dafa50 100644
--- a/mysql-test/suite/tokudb/r/change_column_int_not_supported.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_not_supported.result
diff --git a/mysql-test/suite/tokudb/r/change_column_int_rename.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_rename.result
index 804311ce55c..804311ce55c 100644
--- a/mysql-test/suite/tokudb/r/change_column_int_rename.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_rename.result
diff --git a/mysql-test/suite/tokudb/r/change_column_multiple_columns.result b/storage/tokudb/mysql-test/tokudb/r/change_column_multiple_columns.result
index f4a7b943c90..f4a7b943c90 100644
--- a/mysql-test/suite/tokudb/r/change_column_multiple_columns.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_multiple_columns.result
diff --git a/mysql-test/suite/tokudb/r/change_column_multiple_int.result b/storage/tokudb/mysql-test/tokudb/r/change_column_multiple_int.result
index cb245466e7b..cb245466e7b 100644
--- a/mysql-test/suite/tokudb/r/change_column_multiple_int.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_multiple_int.result
diff --git a/mysql-test/suite/tokudb/r/change_column_text.result b/storage/tokudb/mysql-test/tokudb/r/change_column_text.result
index 8e22d0aa5f7..8e22d0aa5f7 100644
--- a/mysql-test/suite/tokudb/r/change_column_text.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_text.result
diff --git a/mysql-test/suite/tokudb/r/change_column_text_data.result b/storage/tokudb/mysql-test/tokudb/r/change_column_text_data.result
index 222e4b811a1..222e4b811a1 100644
--- a/mysql-test/suite/tokudb/r/change_column_text_data.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_text_data.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
index 635afaf0895..635afaf0895 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_cross256.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_cross256.result
index a0b34cefef8..a0b34cefef8 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_cross256.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_cross256.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
index 874233af69c..874233af69c 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_descriptor.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_descriptor.result
index ae0e4f90afd..ae0e4f90afd 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_descriptor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_descriptor.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_key.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_key.result
index 2c79ae9bafc..2c79ae9bafc 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_key.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_multiple.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
index 3da19a3fd62..3da19a3fd62 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_multiple.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_null.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_null.result
index d00b86c7d3e..d00b86c7d3e 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_null.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_null.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_rename.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_rename.result
index 0cb9d59ca1c..0cb9d59ca1c 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_rename.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_rename.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varbin_varchar.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_varchar.result
index d73f785794c..d73f785794c 100644
--- a/mysql-test/suite/tokudb/r/change_column_varbin_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_varchar.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
index 2e7da5ed5ef..2e7da5ed5ef 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_charset.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_charset.result
index e8940b131b0..e8940b131b0 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_charset.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_charset.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_cross256.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_cross256.result
index 0eae48a25cc..0eae48a25cc 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_cross256.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_cross256.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
index c9ea9737e5f..c9ea9737e5f 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_descriptor.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_descriptor.result
index e11b2430405..e11b2430405 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_descriptor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_descriptor.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_key.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_key.result
index 60c8b26dacc..60c8b26dacc 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_key.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_null.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_null.result
index d5ffe441a8e..d5ffe441a8e 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_null.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_null.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_prefix_a.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
index d40f4abdd4a..d40f4abdd4a 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_prefix_a.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_prefix_b.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
index 6cbf0f9b5b7..6cbf0f9b5b7 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_prefix_b.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_rename.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_rename.result
index 520c08fe01b..520c08fe01b 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_rename.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_rename.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_sum_cross256.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
index 2d56f6b7319..2d56f6b7319 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_sum_cross256.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
diff --git a/mysql-test/suite/tokudb/r/change_column_varchar_varbin.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_varbin.result
index 52fb41b2872..52fb41b2872 100644
--- a/mysql-test/suite/tokudb/r/change_column_varchar_varbin.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_varbin.result
diff --git a/mysql-test/suite/tokudb/r/cluster_1829.result b/storage/tokudb/mysql-test/tokudb/r/cluster_1829.result
index c9f0a949e89..c9f0a949e89 100644
--- a/mysql-test/suite/tokudb/r/cluster_1829.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_1829.result
diff --git a/mysql-test/suite/tokudb/r/cluster_2968-0.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
index e1effd0aba8..e1effd0aba8 100644
--- a/mysql-test/suite/tokudb/r/cluster_2968-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
diff --git a/mysql-test/suite/tokudb/r/cluster_2968-1.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
index 8c0b64217ca..8c0b64217ca 100644
--- a/mysql-test/suite/tokudb/r/cluster_2968-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
diff --git a/mysql-test/suite/tokudb/r/cluster_2968-2.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
index 63718aa2fda..63718aa2fda 100644
--- a/mysql-test/suite/tokudb/r/cluster_2968-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
diff --git a/mysql-test/suite/tokudb/r/cluster_2968-3.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
index adc542cd14b..adc542cd14b 100644
--- a/mysql-test/suite/tokudb/r/cluster_2968-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
diff --git a/mysql-test/suite/tokudb/r/cluster_create_table.result b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
index bf75d3d0bd8..bf75d3d0bd8 100644
--- a/mysql-test/suite/tokudb/r/cluster_create_table.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
diff --git a/mysql-test/suite/tokudb/r/cluster_delete.result b/storage/tokudb/mysql-test/tokudb/r/cluster_delete.result
index 60eff9ebc9a..60eff9ebc9a 100644
--- a/mysql-test/suite/tokudb/r/cluster_delete.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_delete.result
diff --git a/mysql-test/suite/tokudb/r/cluster_delete2.result b/storage/tokudb/mysql-test/tokudb/r/cluster_delete2.result
index 9da4da12786..9da4da12786 100755
--- a/mysql-test/suite/tokudb/r/cluster_delete2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_delete2.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter.result
index 9654975d69c..9654975d69c 100755
--- a/mysql-test/suite/tokudb/r/cluster_filter.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_hidden.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_hidden.result
index 8d0f4ae37d0..8d0f4ae37d0 100644
--- a/mysql-test/suite/tokudb/r/cluster_filter_hidden.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_hidden.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_key.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_key.result
index a594b104444..a594b104444 100755
--- a/mysql-test/suite/tokudb/r/cluster_filter_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_key.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar.result
index d34b4179f7c..d34b4179f7c 100755
--- a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result
index addc82d61e8..addc82d61e8 100644
--- a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar_hidden.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result
index aec735c5d04..aec735c5d04 100644
--- a/mysql-test/suite/tokudb/r/cluster_filter_unpack_varchar_hidden.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result
diff --git a/mysql-test/suite/tokudb/r/cluster_filter_varchar_prefix.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_varchar_prefix.result
index fbd00551045..fbd00551045 100755
--- a/mysql-test/suite/tokudb/r/cluster_filter_varchar_prefix.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_varchar_prefix.result
diff --git a/mysql-test/suite/tokudb/r/cluster_key.result b/storage/tokudb/mysql-test/tokudb/r/cluster_key.result
index 9e008b5eb42..9e008b5eb42 100644
--- a/mysql-test/suite/tokudb/r/cluster_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_key.result
diff --git a/mysql-test/suite/tokudb/r/cluster_key_part.result b/storage/tokudb/mysql-test/tokudb/r/cluster_key_part.result
index 6df54cac05a..6df54cac05a 100644
--- a/mysql-test/suite/tokudb/r/cluster_key_part.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_key_part.result
diff --git a/mysql-test/suite/tokudb/r/cluster_query_plan.result b/storage/tokudb/mysql-test/tokudb/r/cluster_query_plan.result
index da0219dd75b..da0219dd75b 100644
--- a/mysql-test/suite/tokudb/r/cluster_query_plan.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_query_plan.result
diff --git a/mysql-test/suite/tokudb/r/cluster_tokudb_bug_993.result b/storage/tokudb/mysql-test/tokudb/r/cluster_tokudb_bug_993.result
index 316cc972a94..316cc972a94 100644
--- a/mysql-test/suite/tokudb/r/cluster_tokudb_bug_993.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_tokudb_bug_993.result
diff --git a/mysql-test/suite/tokudb/r/cluster_tokudb_bug_993_2.result b/storage/tokudb/mysql-test/tokudb/r/cluster_tokudb_bug_993_2.result
index 80d28728d51..80d28728d51 100644
--- a/mysql-test/suite/tokudb/r/cluster_tokudb_bug_993_2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_tokudb_bug_993_2.result
diff --git a/mysql-test/suite/tokudb/r/cluster_update.result b/storage/tokudb/mysql-test/tokudb/r/cluster_update.result
index dc79656cdb9..dc79656cdb9 100644
--- a/mysql-test/suite/tokudb/r/cluster_update.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_update.result
diff --git a/mysql-test/suite/tokudb/r/cluster_update2.result b/storage/tokudb/mysql-test/tokudb/r/cluster_update2.result
index 891b189bb68..891b189bb68 100755
--- a/mysql-test/suite/tokudb/r/cluster_update2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_update2.result
diff --git a/mysql-test/suite/tokudb/r/ctype_ascii.result b/storage/tokudb/mysql-test/tokudb/r/ctype_ascii.result
index 5ca7a850d93..5ca7a850d93 100644
--- a/mysql-test/suite/tokudb/r/ctype_ascii.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_ascii.result
diff --git a/mysql-test/suite/tokudb/r/ctype_collate.result b/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
index 7c7021efce7..7c7021efce7 100644
--- a/mysql-test/suite/tokudb/r/ctype_collate.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
diff --git a/mysql-test/suite/tokudb/r/ctype_cp1250_ch.result b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
index 12c10bcd967..12c10bcd967 100644
--- a/mysql-test/suite/tokudb/r/ctype_cp1250_ch.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
diff --git a/mysql-test/suite/tokudb/r/ctype_cp1251.result b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1251.result
index 3269e30f096..3269e30f096 100644
--- a/mysql-test/suite/tokudb/r/ctype_cp1251.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1251.result
diff --git a/mysql-test/suite/tokudb/r/ext_key_1_innodb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result
index 96084c64e4f..96084c64e4f 100644
--- a/mysql-test/suite/tokudb/r/ext_key_1_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result
diff --git a/mysql-test/suite/tokudb/r/ext_key_1_tokudb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result
index becf3f1f6a6..becf3f1f6a6 100644
--- a/mysql-test/suite/tokudb/r/ext_key_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result
diff --git a/mysql-test/suite/tokudb/r/ext_key_2_innodb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result
index 186dfd0457f..186dfd0457f 100644
--- a/mysql-test/suite/tokudb/r/ext_key_2_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result
diff --git a/mysql-test/suite/tokudb/r/ext_key_2_tokudb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result
index 6f2913fafb9..6f2913fafb9 100644
--- a/mysql-test/suite/tokudb/r/ext_key_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_binlog_mixed.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_mixed.result
index 28fc4ebccf4..28fc4ebccf4 100644
--- a/mysql-test/suite/tokudb/r/fast_update_binlog_mixed.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_mixed.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_binlog_row.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_row.result
index a2185b0705f..a2185b0705f 100644
--- a/mysql-test/suite/tokudb/r/fast_update_binlog_row.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_row.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_binlog_statement.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result
index b21d58d2754..b21d58d2754 100644
--- a/mysql-test/suite/tokudb/r/fast_update_binlog_statement.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_blobs.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs.result
index 39e0eadf9b8..39e0eadf9b8 100644
--- a/mysql-test/suite/tokudb/r/fast_update_blobs.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_blobs_fixed_varchar.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs_fixed_varchar.result
index 94e5da921a0..94e5da921a0 100644
--- a/mysql-test/suite/tokudb/r/fast_update_blobs_fixed_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs_fixed_varchar.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_blobs_with_varchar.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs_with_varchar.result
index 83d5d450459..83d5d450459 100644
--- a/mysql-test/suite/tokudb/r/fast_update_blobs_with_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_blobs_with_varchar.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_char.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_char.result
index 4121d5d72eb..4121d5d72eb 100644
--- a/mysql-test/suite/tokudb/r/fast_update_char.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_char.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_deadlock.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_deadlock.result
index 7a34d9122ea..7a34d9122ea 100644
--- a/mysql-test/suite/tokudb/r/fast_update_deadlock.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_deadlock.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_decr_floor.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_decr_floor.result
index c93f02a8583..c93f02a8583 100644
--- a/mysql-test/suite/tokudb/r/fast_update_decr_floor.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_decr_floor.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_disable_slow_update.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_disable_slow_update.result
index 13bbb837528..13bbb837528 100644
--- a/mysql-test/suite/tokudb/r/fast_update_disable_slow_update.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_disable_slow_update.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_error.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_error.result
index 7a4795615a9..7a4795615a9 100644
--- a/mysql-test/suite/tokudb/r/fast_update_error.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_error.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_int.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_int.result
index 3e37ceb035a..3e37ceb035a 100644
--- a/mysql-test/suite/tokudb/r/fast_update_int.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_int.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_int_bounds.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result
index 042cbcf0f70..042cbcf0f70 100644
--- a/mysql-test/suite/tokudb/r/fast_update_int_bounds.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_key.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result
index fd819add354..fd819add354 100644
--- a/mysql-test/suite/tokudb/r/fast_update_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_sqlmode.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_sqlmode.result
index 262b242fbec..262b242fbec 100644
--- a/mysql-test/suite/tokudb/r/fast_update_sqlmode.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_sqlmode.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_uint_bounds.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_uint_bounds.result
index 0cf9089df5e..0cf9089df5e 100644
--- a/mysql-test/suite/tokudb/r/fast_update_uint_bounds.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_uint_bounds.result
diff --git a/mysql-test/suite/tokudb/r/fast_update_varchar.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_varchar.result
index f12e4121264..f12e4121264 100644
--- a/mysql-test/suite/tokudb/r/fast_update_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_varchar.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_bin_pad.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_bin_pad.result
index 44cf18a79b2..44cf18a79b2 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_bin_pad.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_bin_pad.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_char.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_char.result
index d8036ff6607..d8036ff6607 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_char.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_char.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_deadlock.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result
index 192d32d9a95..192d32d9a95 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_deadlock.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_deadlock.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_int.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_int.result
index 0d500c480a8..0d500c480a8 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_int.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_int.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_key.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_key.result
index 95e31062c88..95e31062c88 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_key.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_sqlmode.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result
index 9b1fd60d691..9b1fd60d691 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_sqlmode.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result
diff --git a/mysql-test/suite/tokudb/r/fast_upsert_values.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_values.result
index d2214fb1cd9..d2214fb1cd9 100644
--- a/mysql-test/suite/tokudb/r/fast_upsert_values.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_values.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-del-0.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-0.result
index 6e6874f6d8b..6e6874f6d8b 100644
--- a/mysql-test/suite/tokudb/r/hotindex-del-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-0.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-del-1.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-1.result
index 3ab09c07935..3ab09c07935 100644
--- a/mysql-test/suite/tokudb/r/hotindex-del-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-1.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-del-fast.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-fast.result
index ecb2d225181..ecb2d225181 100644
--- a/mysql-test/suite/tokudb/r/hotindex-del-fast.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-fast.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-del-slow.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-slow.result
index e1e298eb29f..e1e298eb29f 100644
--- a/mysql-test/suite/tokudb/r/hotindex-del-slow.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-del-slow.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-insert-0.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-0.result
index 78515053ff6..78515053ff6 100644
--- a/mysql-test/suite/tokudb/r/hotindex-insert-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-0.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-insert-1.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-1.result
index aa6075febdd..aa6075febdd 100644
--- a/mysql-test/suite/tokudb/r/hotindex-insert-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-1.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-insert-2.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-2.result
index 1c8b7df1ebd..1c8b7df1ebd 100644
--- a/mysql-test/suite/tokudb/r/hotindex-insert-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-2.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-insert-bigchar.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-bigchar.result
index 2ec2b59e75f..2ec2b59e75f 100644
--- a/mysql-test/suite/tokudb/r/hotindex-insert-bigchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-insert-bigchar.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-update-0.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-update-0.result
index 8ec9af009bb..8ec9af009bb 100644
--- a/mysql-test/suite/tokudb/r/hotindex-update-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-update-0.result
diff --git a/mysql-test/suite/tokudb/r/hotindex-update-1.result b/storage/tokudb/mysql-test/tokudb/r/hotindex-update-1.result
index 092e1ffc814..092e1ffc814 100644
--- a/mysql-test/suite/tokudb/r/hotindex-update-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/hotindex-update-1.result
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result
index 190581eddae..190581eddae 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result
index 13cdad7a438..13cdad7a438 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_locks.result
index a07f7ba52fe..a07f7ba52fe 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_locks.result
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_locks_released.result
index 0a5862e9322..0a5862e9322 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_locks_released.result
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_trx.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result
index 63e4816e16e..63e4816e16e 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_trx.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result
diff --git a/mysql-test/suite/tokudb/r/information-schema-global-status.result b/storage/tokudb/mysql-test/tokudb/r/information-schema-global-status.result
index 0f51699f297..0f51699f297 100644
--- a/mysql-test/suite/tokudb/r/information-schema-global-status.result
+++ b/storage/tokudb/mysql-test/tokudb/r/information-schema-global-status.result
diff --git a/mysql-test/suite/tokudb/r/lockretry-insert.writelocktable.result b/storage/tokudb/mysql-test/tokudb/r/lockretry-insert.writelocktable.result
index 439c032639d..439c032639d 100644
--- a/mysql-test/suite/tokudb/r/lockretry-insert.writelocktable.result
+++ b/storage/tokudb/mysql-test/tokudb/r/lockretry-insert.writelocktable.result
diff --git a/mysql-test/suite/tokudb/r/lockretry-writelocktable.insert.result b/storage/tokudb/mysql-test/tokudb/r/lockretry-writelocktable.insert.result
index d8dad90efdc..d8dad90efdc 100644
--- a/mysql-test/suite/tokudb/r/lockretry-writelocktable.insert.result
+++ b/storage/tokudb/mysql-test/tokudb/r/lockretry-writelocktable.insert.result
diff --git a/mysql-test/suite/tokudb/r/lockretry-writelocktable.insert2.result b/storage/tokudb/mysql-test/tokudb/r/lockretry-writelocktable.insert2.result
index 36073f932d4..36073f932d4 100644
--- a/mysql-test/suite/tokudb/r/lockretry-writelocktable.insert2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/lockretry-writelocktable.insert2.result
diff --git a/mysql-test/suite/tokudb/r/locks-blocking-row-locks-getset.result b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks-getset.result
index 01db8bbd8ab..01db8bbd8ab 100644
--- a/mysql-test/suite/tokudb/r/locks-blocking-row-locks-getset.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks-getset.result
diff --git a/mysql-test/suite/tokudb/r/locks-blocking-row-locks-race.result b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks-race.result
index a89f8ddd82a..a89f8ddd82a 100644
--- a/mysql-test/suite/tokudb/r/locks-blocking-row-locks-race.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks-race.result
diff --git a/mysql-test/suite/tokudb/r/locks-blocking-row-locks.result b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks.result
index 060aeda803b..060aeda803b 100644
--- a/mysql-test/suite/tokudb/r/locks-blocking-row-locks.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-blocking-row-locks.result
diff --git a/mysql-test/suite/tokudb/r/locks-delete-deadlock-1.result b/storage/tokudb/mysql-test/tokudb/r/locks-delete-deadlock-1.result
index d2feccac563..d2feccac563 100644
--- a/mysql-test/suite/tokudb/r/locks-delete-deadlock-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-delete-deadlock-1.result
diff --git a/mysql-test/suite/tokudb/r/locks-no-read-lock-serializable-autocommit.result b/storage/tokudb/mysql-test/tokudb/r/locks-no-read-lock-serializable-autocommit.result
index fa6b28ddc93..fa6b28ddc93 100644
--- a/mysql-test/suite/tokudb/r/locks-no-read-lock-serializable-autocommit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-no-read-lock-serializable-autocommit.result
diff --git a/mysql-test/suite/tokudb/r/locks-select-update-1.result b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-1.result
index a816808a2d5..a816808a2d5 100644
--- a/mysql-test/suite/tokudb/r/locks-select-update-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-1.result
diff --git a/mysql-test/suite/tokudb/r/locks-select-update-2.result b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-2.result
index cea61214669..cea61214669 100644
--- a/mysql-test/suite/tokudb/r/locks-select-update-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-2.result
diff --git a/mysql-test/suite/tokudb/r/locks-select-update-3.result b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result
index 8b31bf5a280..8b31bf5a280 100644
--- a/mysql-test/suite/tokudb/r/locks-select-update-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result
diff --git a/mysql-test/suite/tokudb/r/locks-update-deadlock-1.result b/storage/tokudb/mysql-test/tokudb/r/locks-update-deadlock-1.result
index 1357c30b22d..1357c30b22d 100644
--- a/mysql-test/suite/tokudb/r/locks-update-deadlock-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/locks-update-deadlock-1.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-1.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-1.result
index 439c5e897ab..439c5e897ab 100755
--- a/mysql-test/suite/tokudb/r/mvcc-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-1.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-10.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
index 319048cfd8b..319048cfd8b 100755
--- a/mysql-test/suite/tokudb/r/mvcc-10.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-11.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
index a89ba26a461..a89ba26a461 100755
--- a/mysql-test/suite/tokudb/r/mvcc-11.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-12.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
index b307f487f03..b307f487f03 100755
--- a/mysql-test/suite/tokudb/r/mvcc-12.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-13.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
index 2f87ddb26cc..2f87ddb26cc 100755
--- a/mysql-test/suite/tokudb/r/mvcc-13.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-14.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
index eecb674346f..eecb674346f 100755
--- a/mysql-test/suite/tokudb/r/mvcc-14.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-15.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
index 0b7d96dd7b5..0b7d96dd7b5 100755
--- a/mysql-test/suite/tokudb/r/mvcc-15.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-16.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
index 7ee801d88b2..7ee801d88b2 100755
--- a/mysql-test/suite/tokudb/r/mvcc-16.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-17.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
index fe3322b9fb7..fe3322b9fb7 100755
--- a/mysql-test/suite/tokudb/r/mvcc-17.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-18.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
index 1edda2650e2..1edda2650e2 100755
--- a/mysql-test/suite/tokudb/r/mvcc-18.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-19.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-19.result
index 9686198ff4b..9686198ff4b 100755
--- a/mysql-test/suite/tokudb/r/mvcc-19.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-19.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-2.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-2.result
index 1223360fc3f..1223360fc3f 100755
--- a/mysql-test/suite/tokudb/r/mvcc-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-2.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-20.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-20.result
index 383d39633ec..383d39633ec 100755
--- a/mysql-test/suite/tokudb/r/mvcc-20.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-20.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-21.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
index bee7c8b4549..bee7c8b4549 100755
--- a/mysql-test/suite/tokudb/r/mvcc-21.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-22.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
index 5d986701785..5d986701785 100755
--- a/mysql-test/suite/tokudb/r/mvcc-22.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-23.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
index 9ea3c631d17..9ea3c631d17 100755
--- a/mysql-test/suite/tokudb/r/mvcc-23.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-24.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-24.result
index aad61cdb8dc..aad61cdb8dc 100755
--- a/mysql-test/suite/tokudb/r/mvcc-24.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-24.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-25.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
index 427d1ca5c3f..427d1ca5c3f 100755
--- a/mysql-test/suite/tokudb/r/mvcc-25.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-26.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-26.result
index ba5e6ab69f8..ba5e6ab69f8 100644
--- a/mysql-test/suite/tokudb/r/mvcc-26.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-26.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-27.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-27.result
index 5f7ee555130..5f7ee555130 100755
--- a/mysql-test/suite/tokudb/r/mvcc-27.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-27.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-28.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-28.result
index 7562495484c..7562495484c 100755
--- a/mysql-test/suite/tokudb/r/mvcc-28.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-28.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-2808-read-committed.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-2808-read-committed.result
index 80f4b229987..80f4b229987 100755
--- a/mysql-test/suite/tokudb/r/mvcc-2808-read-committed.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-2808-read-committed.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-2808-read-uncommitted.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-2808-read-uncommitted.result
index e8ffcc7f843..e8ffcc7f843 100755
--- a/mysql-test/suite/tokudb/r/mvcc-2808-read-uncommitted.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-2808-read-uncommitted.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-29.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result
index 5c02babaed3..5c02babaed3 100755
--- a/mysql-test/suite/tokudb/r/mvcc-29.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-3.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
index 684dd147b07..684dd147b07 100755
--- a/mysql-test/suite/tokudb/r/mvcc-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-30.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result
index c57787f2a8d..c57787f2a8d 100755
--- a/mysql-test/suite/tokudb/r/mvcc-30.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-31.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result
index ebc5ae49535..ebc5ae49535 100755
--- a/mysql-test/suite/tokudb/r/mvcc-31.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-33.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
index 1a516982b85..1a516982b85 100644
--- a/mysql-test/suite/tokudb/r/mvcc-33.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-34.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
index 1c591e453aa..1c591e453aa 100644
--- a/mysql-test/suite/tokudb/r/mvcc-34.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-35.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
index 5c7e1b34e5a..5c7e1b34e5a 100644
--- a/mysql-test/suite/tokudb/r/mvcc-35.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-36.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
index 0e7c9a88d82..0e7c9a88d82 100644
--- a/mysql-test/suite/tokudb/r/mvcc-36.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-37.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
index 69fb11a0ade..69fb11a0ade 100644
--- a/mysql-test/suite/tokudb/r/mvcc-37.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-38.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
index 72bc7673e48..72bc7673e48 100644
--- a/mysql-test/suite/tokudb/r/mvcc-38.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-39.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
index 905d5c2292a..905d5c2292a 100755
--- a/mysql-test/suite/tokudb/r/mvcc-39.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-4.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
index ce8aa725f5b..ce8aa725f5b 100755
--- a/mysql-test/suite/tokudb/r/mvcc-4.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-40.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
index 1330fe41c50..1330fe41c50 100755
--- a/mysql-test/suite/tokudb/r/mvcc-40.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-5.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
index 47204dcc7e1..47204dcc7e1 100755
--- a/mysql-test/suite/tokudb/r/mvcc-5.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-6.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
index a0c8185b1ab..a0c8185b1ab 100755
--- a/mysql-test/suite/tokudb/r/mvcc-6.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-7.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
index ba78f786c31..ba78f786c31 100755
--- a/mysql-test/suite/tokudb/r/mvcc-7.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-8.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
index fdf3591aad7..fdf3591aad7 100644
--- a/mysql-test/suite/tokudb/r/mvcc-8.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-9.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
index b3b45d731f2..b3b45d731f2 100755
--- a/mysql-test/suite/tokudb/r/mvcc-9.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
diff --git a/mysql-test/suite/tokudb/r/mvcc-checksum-locks.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
index c6bea70265b..c6bea70265b 100755
--- a/mysql-test/suite/tokudb/r/mvcc-checksum-locks.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
diff --git a/mysql-test/suite/tokudb/r/nested_txn_autocommit.result b/storage/tokudb/mysql-test/tokudb/r/nested_txn_autocommit.result
index a6cbc127fa8..a6cbc127fa8 100755
--- a/mysql-test/suite/tokudb/r/nested_txn_autocommit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/nested_txn_autocommit.result
diff --git a/mysql-test/suite/tokudb/r/nested_txn_begin.result b/storage/tokudb/mysql-test/tokudb/r/nested_txn_begin.result
index 9633ceb3ad6..9633ceb3ad6 100755
--- a/mysql-test/suite/tokudb/r/nested_txn_begin.result
+++ b/storage/tokudb/mysql-test/tokudb/r/nested_txn_begin.result
diff --git a/mysql-test/suite/tokudb/r/nested_txn_implicit_commit.result b/storage/tokudb/mysql-test/tokudb/r/nested_txn_implicit_commit.result
index ac1a13d5523..ac1a13d5523 100755
--- a/mysql-test/suite/tokudb/r/nested_txn_implicit_commit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/nested_txn_implicit_commit.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_1.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_1.result
index c58db4f140c..c58db4f140c 100644
--- a/mysql-test/suite/tokudb/r/prim_key_1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_1.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_2.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_2.result
index bfa9f309035..bfa9f309035 100644
--- a/mysql-test/suite/tokudb/r/prim_key_2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_2.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_3.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_3.result
index 34e3a2fba3d..34e3a2fba3d 100644
--- a/mysql-test/suite/tokudb/r/prim_key_3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_3.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_4.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_4.result
index 9931abb9347..9931abb9347 100644
--- a/mysql-test/suite/tokudb/r/prim_key_4.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_4.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_5.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_5.result
index 2f930127833..2f930127833 100644
--- a/mysql-test/suite/tokudb/r/prim_key_5.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_5.result
diff --git a/mysql-test/suite/tokudb/r/prim_key_6.result b/storage/tokudb/mysql-test/tokudb/r/prim_key_6.result
index 2a4db1685fb..2a4db1685fb 100644
--- a/mysql-test/suite/tokudb/r/prim_key_6.result
+++ b/storage/tokudb/mysql-test/tokudb/r/prim_key_6.result
diff --git a/mysql-test/suite/tokudb/r/replace-ignore.result b/storage/tokudb/mysql-test/tokudb/r/replace-ignore.result
index e86700ed8c3..e86700ed8c3 100644
--- a/mysql-test/suite/tokudb/r/replace-ignore.result
+++ b/storage/tokudb/mysql-test/tokudb/r/replace-ignore.result
diff --git a/mysql-test/suite/tokudb/r/rows-32m-0.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-0.result
index 0a17b532ca6..0a17b532ca6 100644
--- a/mysql-test/suite/tokudb/r/rows-32m-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-0.result
diff --git a/mysql-test/suite/tokudb/r/rows-32m-1.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-1.result
index 37fb344c756..37fb344c756 100644
--- a/mysql-test/suite/tokudb/r/rows-32m-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-1.result
diff --git a/mysql-test/suite/tokudb/r/rows-32m-rand-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result
index b287c70469e..b287c70469e 100644
--- a/mysql-test/suite/tokudb/r/rows-32m-rand-insert.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result
diff --git a/mysql-test/suite/tokudb/r/rows-32m-seq-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result
index a242cac98c2..a242cac98c2 100644
--- a/mysql-test/suite/tokudb/r/rows-32m-seq-insert.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-1078-2.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-2.result
index 3507563bc3d..3507563bc3d 100755
--- a/mysql-test/suite/tokudb/r/savepoint-1078-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-2.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-1078-3.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-3.result
index 96edb62d377..96edb62d377 100755
--- a/mysql-test/suite/tokudb/r/savepoint-1078-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-3.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-1078-4.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-4.result
index 8e74366c392..8e74366c392 100755
--- a/mysql-test/suite/tokudb/r/savepoint-1078-4.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078-4.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-1078.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078.result
index 775ba06ad22..775ba06ad22 100755
--- a/mysql-test/suite/tokudb/r/savepoint-1078.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-1078.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-2.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-2.result
index 2e841b1e255..2e841b1e255 100755
--- a/mysql-test/suite/tokudb/r/savepoint-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-2.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-3.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-3.result
index e7e9fa332ab..e7e9fa332ab 100755
--- a/mysql-test/suite/tokudb/r/savepoint-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-3.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-4.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-4.result
index 16e723d6c5c..16e723d6c5c 100755
--- a/mysql-test/suite/tokudb/r/savepoint-4.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-4.result
diff --git a/mysql-test/suite/tokudb/r/savepoint-5.result b/storage/tokudb/mysql-test/tokudb/r/savepoint-5.result
index 55c43c5fb95..55c43c5fb95 100755
--- a/mysql-test/suite/tokudb/r/savepoint-5.result
+++ b/storage/tokudb/mysql-test/tokudb/r/savepoint-5.result
diff --git a/mysql-test/suite/tokudb/r/simple_delete_all.result b/storage/tokudb/mysql-test/tokudb/r/simple_delete_all.result
index e280dd9ed09..e280dd9ed09 100644
--- a/mysql-test/suite/tokudb/r/simple_delete_all.result
+++ b/storage/tokudb/mysql-test/tokudb/r/simple_delete_all.result
diff --git a/mysql-test/suite/tokudb/r/simple_join_tokudb_innodb.result b/storage/tokudb/mysql-test/tokudb/r/simple_join_tokudb_innodb.result
index 287ea4899c5..287ea4899c5 100644
--- a/mysql-test/suite/tokudb/r/simple_join_tokudb_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/simple_join_tokudb_innodb.result
diff --git a/mysql-test/suite/tokudb/r/simple_join_tokudb_myisam.result b/storage/tokudb/mysql-test/tokudb/r/simple_join_tokudb_myisam.result
index 3fdb83375f7..3fdb83375f7 100644
--- a/mysql-test/suite/tokudb/r/simple_join_tokudb_myisam.result
+++ b/storage/tokudb/mysql-test/tokudb/r/simple_join_tokudb_myisam.result
diff --git a/mysql-test/suite/tokudb/r/simple_truncate.result b/storage/tokudb/mysql-test/tokudb/r/simple_truncate.result
index dc24c64872c..dc24c64872c 100644
--- a/mysql-test/suite/tokudb/r/simple_truncate.result
+++ b/storage/tokudb/mysql-test/tokudb/r/simple_truncate.result
diff --git a/mysql-test/suite/tokudb/r/sql_mode_default.result b/storage/tokudb/mysql-test/tokudb/r/sql_mode_default.result
index 17dc09667c6..17dc09667c6 100644
--- a/mysql-test/suite/tokudb/r/sql_mode_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/sql_mode_default.result
diff --git a/mysql-test/suite/tokudb/r/storage_engine_default.result b/storage/tokudb/mysql-test/tokudb/r/storage_engine_default.result
index 61a4192b41d..61a4192b41d 100644
--- a/mysql-test/suite/tokudb/r/storage_engine_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/storage_engine_default.result
diff --git a/mysql-test/suite/tokudb/r/tokudb_support_xa.result b/storage/tokudb/mysql-test/tokudb/r/tokudb_support_xa.result
index c265f38cdc2..c265f38cdc2 100644
--- a/mysql-test/suite/tokudb/r/tokudb_support_xa.result
+++ b/storage/tokudb/mysql-test/tokudb/r/tokudb_support_xa.result
diff --git a/mysql-test/suite/tokudb/r/truncate_row_count.result b/storage/tokudb/mysql-test/tokudb/r/truncate_row_count.result
index d9ab919a954..d9ab919a954 100644
--- a/mysql-test/suite/tokudb/r/truncate_row_count.result
+++ b/storage/tokudb/mysql-test/tokudb/r/truncate_row_count.result
diff --git a/mysql-test/suite/tokudb/r/truncate_txn_commit.result b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_commit.result
index 537dd698df4..537dd698df4 100644
--- a/mysql-test/suite/tokudb/r/truncate_txn_commit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_commit.result
diff --git a/mysql-test/suite/tokudb/r/truncate_txn_rollback.result b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_rollback.result
index 423d8db478e..423d8db478e 100644
--- a/mysql-test/suite/tokudb/r/truncate_txn_rollback.result
+++ b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_rollback.result
diff --git a/mysql-test/suite/tokudb/r/truncate_txn_rollback_innodb.result b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_rollback_innodb.result
index 98eb3c4ec83..98eb3c4ec83 100644
--- a/mysql-test/suite/tokudb/r/truncate_txn_rollback_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/truncate_txn_rollback_innodb.result
diff --git a/mysql-test/suite/tokudb/r/type_binary.result b/storage/tokudb/mysql-test/tokudb/r/type_binary.result
index cfa15259471..cfa15259471 100644
--- a/mysql-test/suite/tokudb/r/type_binary.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_binary.result
diff --git a/mysql-test/suite/tokudb/r/type_bit.result b/storage/tokudb/mysql-test/tokudb/r/type_bit.result
index f3285b8c3e5..f3285b8c3e5 100644
--- a/mysql-test/suite/tokudb/r/type_bit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_bit.result
diff --git a/mysql-test/suite/tokudb/r/type_bit_innodb.result b/storage/tokudb/mysql-test/tokudb/r/type_bit_innodb.result
index 9ce2b0f5b6a..9ce2b0f5b6a 100644
--- a/mysql-test/suite/tokudb/r/type_bit_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_bit_innodb.result
diff --git a/mysql-test/suite/tokudb/r/type_blob.result b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
index 4cbac37c117..4cbac37c117 100644
--- a/mysql-test/suite/tokudb/r/type_blob.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
diff --git a/mysql-test/suite/tokudb/r/type_date.result b/storage/tokudb/mysql-test/tokudb/r/type_date.result
index acee8beaff1..acee8beaff1 100644
--- a/mysql-test/suite/tokudb/r/type_date.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_date.result
diff --git a/mysql-test/suite/tokudb/r/type_datetime.result b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
index 854f3482f74..854f3482f74 100644
--- a/mysql-test/suite/tokudb/r/type_datetime.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
diff --git a/mysql-test/suite/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
index cd501c25e2a..cd501c25e2a 100644
--- a/mysql-test/suite/tokudb/r/type_decimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
diff --git a/mysql-test/suite/tokudb/r/type_enum.result b/storage/tokudb/mysql-test/tokudb/r/type_enum.result
index 3a1654ef287..3a1654ef287 100644
--- a/mysql-test/suite/tokudb/r/type_enum.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_enum.result
diff --git a/mysql-test/suite/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result
index 503d1148b44..503d1148b44 100644
--- a/mysql-test/suite/tokudb/r/type_float.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result
diff --git a/mysql-test/suite/tokudb/r/type_nchar.result b/storage/tokudb/mysql-test/tokudb/r/type_nchar.result
index 6973a084ae0..6973a084ae0 100644
--- a/mysql-test/suite/tokudb/r/type_nchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_nchar.result
diff --git a/mysql-test/suite/tokudb/r/type_newdecimal-big.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal-big.result
index 7393a44e764..7393a44e764 100644
--- a/mysql-test/suite/tokudb/r/type_newdecimal-big.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal-big.result
diff --git a/mysql-test/suite/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
index 42ddc95f953..42ddc95f953 100644
--- a/mysql-test/suite/tokudb/r/type_newdecimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
diff --git a/mysql-test/suite/tokudb/r/type_ranges.result b/storage/tokudb/mysql-test/tokudb/r/type_ranges.result
index c1656a663e1..c1656a663e1 100644
--- a/mysql-test/suite/tokudb/r/type_ranges.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_ranges.result
diff --git a/mysql-test/suite/tokudb/r/type_set.result b/storage/tokudb/mysql-test/tokudb/r/type_set.result
index dcd66edc134..dcd66edc134 100644
--- a/mysql-test/suite/tokudb/r/type_set.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_set.result
diff --git a/mysql-test/suite/tokudb/r/type_temporal_fractional.result b/storage/tokudb/mysql-test/tokudb/r/type_temporal_fractional.result
index bd0b04c7b7e..bd0b04c7b7e 100644
--- a/mysql-test/suite/tokudb/r/type_temporal_fractional.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_temporal_fractional.result
diff --git a/mysql-test/suite/tokudb/r/type_temporal_upgrade.result b/storage/tokudb/mysql-test/tokudb/r/type_temporal_upgrade.result
index 5cfd47587a5..5cfd47587a5 100644
--- a/mysql-test/suite/tokudb/r/type_temporal_upgrade.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_temporal_upgrade.result
diff --git a/mysql-test/suite/tokudb/r/type_time.result b/storage/tokudb/mysql-test/tokudb/r/type_time.result
index e5dc9ff6a2d..e5dc9ff6a2d 100644
--- a/mysql-test/suite/tokudb/r/type_time.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_time.result
diff --git a/mysql-test/suite/tokudb/r/type_timestamp.result b/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
index 0edd7af3a14..0edd7af3a14 100644
--- a/mysql-test/suite/tokudb/r/type_timestamp.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
diff --git a/mysql-test/suite/tokudb/r/type_timestamp_explicit.result b/storage/tokudb/mysql-test/tokudb/r/type_timestamp_explicit.result
index 4fdd04f7bda..4fdd04f7bda 100644
--- a/mysql-test/suite/tokudb/r/type_timestamp_explicit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_timestamp_explicit.result
diff --git a/mysql-test/suite/tokudb/r/type_uint.result b/storage/tokudb/mysql-test/tokudb/r/type_uint.result
index 7f314c541ff..7f314c541ff 100644
--- a/mysql-test/suite/tokudb/r/type_uint.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_uint.result
diff --git a/mysql-test/suite/tokudb/r/type_varchar.result b/storage/tokudb/mysql-test/tokudb/r/type_varchar.result
index 3f851c3e88f..3f851c3e88f 100644
--- a/mysql-test/suite/tokudb/r/type_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_varchar.result
diff --git a/mysql-test/suite/tokudb/r/type_year.result b/storage/tokudb/mysql-test/tokudb/r/type_year.result
index 06db44eb0e5..06db44eb0e5 100644
--- a/mysql-test/suite/tokudb/r/type_year.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_year.result
diff --git a/mysql-test/suite/tokudb/replace-ignore-gen.py b/storage/tokudb/mysql-test/tokudb/replace-ignore-gen.py
index d8227da96a5..d8227da96a5 100644
--- a/mysql-test/suite/tokudb/replace-ignore-gen.py
+++ b/storage/tokudb/mysql-test/tokudb/replace-ignore-gen.py
diff --git a/mysql-test/suite/tokudb/t/auto_increment.test b/storage/tokudb/mysql-test/tokudb/t/auto_increment.test
index 595c4d14600..595c4d14600 100644
--- a/mysql-test/suite/tokudb/t/auto_increment.test
+++ b/storage/tokudb/mysql-test/tokudb/t/auto_increment.test
diff --git a/mysql-test/suite/tokudb/t/auto_increment_boundary.test b/storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary.test
index 4cccc29d386..4cccc29d386 100644
--- a/mysql-test/suite/tokudb/t/auto_increment_boundary.test
+++ b/storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary.test
diff --git a/mysql-test/suite/tokudb/t/auto_increment_boundary_traditional.test b/storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary_traditional.test
index 2e73cf4a53d..2e73cf4a53d 100644
--- a/mysql-test/suite/tokudb/t/auto_increment_boundary_traditional.test
+++ b/storage/tokudb/mysql-test/tokudb/t/auto_increment_boundary_traditional.test
diff --git a/mysql-test/suite/tokudb/t/background_job_manager.test b/storage/tokudb/mysql-test/tokudb/t/background_job_manager.test
index 933814442e0..933814442e0 100644
--- a/mysql-test/suite/tokudb/t/background_job_manager.test
+++ b/storage/tokudb/mysql-test/tokudb/t/background_job_manager.test
diff --git a/mysql-test/suite/tokudb/t/bf_create_select.test b/storage/tokudb/mysql-test/tokudb/t/bf_create_select.test
index 8c457b75f27..8c457b75f27 100644
--- a/mysql-test/suite/tokudb/t/bf_create_select.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_create_select.test
diff --git a/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test b/storage/tokudb/mysql-test/tokudb/t/bf_create_select_hash_part.test
index 34995b4ba2f..34995b4ba2f 100644
--- a/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_create_select_hash_part.test
diff --git a/mysql-test/suite/tokudb/t/bf_create_select_range_part.test b/storage/tokudb/mysql-test/tokudb/t/bf_create_select_range_part.test
index a53249893f4..a53249893f4 100644
--- a/mysql-test/suite/tokudb/t/bf_create_select_range_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_create_select_range_part.test
diff --git a/mysql-test/suite/tokudb/t/bf_create_temp_select.test b/storage/tokudb/mysql-test/tokudb/t/bf_create_temp_select.test
index 4f8211a51d9..4f8211a51d9 100644
--- a/mysql-test/suite/tokudb/t/bf_create_temp_select.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_create_temp_select.test
diff --git a/mysql-test/suite/tokudb/t/bf_delete.test b/storage/tokudb/mysql-test/tokudb/t/bf_delete.test
index a55d78784cc..a55d78784cc 100644
--- a/mysql-test/suite/tokudb/t/bf_delete.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_delete.test
diff --git a/mysql-test/suite/tokudb/t/bf_delete_trigger.test b/storage/tokudb/mysql-test/tokudb/t/bf_delete_trigger.test
index 031a48feab1..031a48feab1 100644
--- a/mysql-test/suite/tokudb/t/bf_delete_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_delete_trigger.test
diff --git a/mysql-test/suite/tokudb/t/bf_insert_select.test b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select.test
index 8d96c26bc29..8d96c26bc29 100644
--- a/mysql-test/suite/tokudb/t/bf_insert_select.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select.test
diff --git a/mysql-test/suite/tokudb/t/bf_insert_select_dup_key.test b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_dup_key.test
index 1b015b2c272..1b015b2c272 100644
--- a/mysql-test/suite/tokudb/t/bf_insert_select_dup_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_dup_key.test
diff --git a/mysql-test/suite/tokudb/t/bf_insert_select_trigger.test b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_trigger.test
index 337013c9dad..337013c9dad 100644
--- a/mysql-test/suite/tokudb/t/bf_insert_select_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_trigger.test
diff --git a/mysql-test/suite/tokudb/t/bf_insert_select_update_trigger.test b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_update_trigger.test
index d5addc69076..d5addc69076 100644
--- a/mysql-test/suite/tokudb/t/bf_insert_select_update_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_insert_select_update_trigger.test
diff --git a/mysql-test/suite/tokudb/t/bf_replace_select.test b/storage/tokudb/mysql-test/tokudb/t/bf_replace_select.test
index 72cda349f80..72cda349f80 100644
--- a/mysql-test/suite/tokudb/t/bf_replace_select.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_replace_select.test
diff --git a/mysql-test/suite/tokudb/t/bf_replace_select_trigger.test b/storage/tokudb/mysql-test/tokudb/t/bf_replace_select_trigger.test
index 6b098ce04af..6b098ce04af 100644
--- a/mysql-test/suite/tokudb/t/bf_replace_select_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_replace_select_trigger.test
diff --git a/mysql-test/suite/tokudb/t/bf_select_hash_part.test b/storage/tokudb/mysql-test/tokudb/t/bf_select_hash_part.test
index 46986278743..46986278743 100644
--- a/mysql-test/suite/tokudb/t/bf_select_hash_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_select_hash_part.test
diff --git a/mysql-test/suite/tokudb/t/bf_select_range_part.test b/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test
index 7e608777798..7e608777798 100644
--- a/mysql-test/suite/tokudb/t/bf_select_range_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test
diff --git a/mysql-test/suite/tokudb/t/bulk-fetch.test b/storage/tokudb/mysql-test/tokudb/t/bulk-fetch.test
index 46b1ea106a3..46b1ea106a3 100644
--- a/mysql-test/suite/tokudb/t/bulk-fetch.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bulk-fetch.test
diff --git a/mysql-test/suite/tokudb/t/bulk-fetch2.test b/storage/tokudb/mysql-test/tokudb/t/bulk-fetch2.test
index 2afe959537f..2afe959537f 100644
--- a/mysql-test/suite/tokudb/t/bulk-fetch2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/bulk-fetch2.test
diff --git a/mysql-test/suite/tokudb/t/card_add_drop.test b/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test
index 8563bf28ad1..8563bf28ad1 100644
--- a/mysql-test/suite/tokudb/t/card_add_drop.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_add_drop.test
diff --git a/mysql-test/suite/tokudb/t/card_add_index.test b/storage/tokudb/mysql-test/tokudb/t/card_add_index.test
index 455dae55236..455dae55236 100644
--- a/mysql-test/suite/tokudb/t/card_add_index.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_add_index.test
diff --git a/mysql-test/suite/tokudb/t/card_auto_analyze_lots.test b/storage/tokudb/mysql-test/tokudb/t/card_auto_analyze_lots.test
index ec74a4a28bc..ec74a4a28bc 100644
--- a/mysql-test/suite/tokudb/t/card_auto_analyze_lots.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_auto_analyze_lots.test
diff --git a/mysql-test/suite/tokudb/t/card_drop_index.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test
index b8e7d575dbd..b8e7d575dbd 100644
--- a/mysql-test/suite/tokudb/t/card_drop_index.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_index.test
diff --git a/mysql-test/suite/tokudb/t/card_drop_index_2.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test
index 88e0f6a413f..88e0f6a413f 100644
--- a/mysql-test/suite/tokudb/t/card_drop_index_2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test
diff --git a/mysql-test/suite/tokudb/t/card_drop_pk.test b/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test
index 365d920aa80..365d920aa80 100644
--- a/mysql-test/suite/tokudb/t/card_drop_pk.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_drop_pk.test
diff --git a/mysql-test/suite/tokudb/t/card_no_keys.test b/storage/tokudb/mysql-test/tokudb/t/card_no_keys.test
index 7a0a816df1d..7a0a816df1d 100644
--- a/mysql-test/suite/tokudb/t/card_no_keys.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_no_keys.test
diff --git a/mysql-test/suite/tokudb/t/card_pk.test b/storage/tokudb/mysql-test/tokudb/t/card_pk.test
index b031a33b2a5..b031a33b2a5 100644
--- a/mysql-test/suite/tokudb/t/card_pk.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_pk.test
diff --git a/mysql-test/suite/tokudb/t/card_pk_2.test b/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test
index 826714931aa..826714931aa 100644
--- a/mysql-test/suite/tokudb/t/card_pk_2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_pk_2.test
diff --git a/mysql-test/suite/tokudb/t/card_pk_sk.test b/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test
index f1e11fbbc2a..f1e11fbbc2a 100644
--- a/mysql-test/suite/tokudb/t/card_pk_sk.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_pk_sk.test
diff --git a/mysql-test/suite/tokudb/t/card_scale_percent.test b/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test
index 47f1eb37989..47f1eb37989 100644
--- a/mysql-test/suite/tokudb/t/card_scale_percent.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_scale_percent.test
diff --git a/mysql-test/suite/tokudb/t/card_sk.test b/storage/tokudb/mysql-test/tokudb/t/card_sk.test
index cf50b8b167b..cf50b8b167b 100644
--- a/mysql-test/suite/tokudb/t/card_sk.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_sk.test
diff --git a/mysql-test/suite/tokudb/t/card_sk_2.test b/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test
index 2cd4ece972e..2cd4ece972e 100644
--- a/mysql-test/suite/tokudb/t/card_sk_2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_sk_2.test
diff --git a/mysql-test/suite/tokudb/t/card_unique_sk.test b/storage/tokudb/mysql-test/tokudb/t/card_unique_sk.test
index b752f5e2fdb..b752f5e2fdb 100644
--- a/mysql-test/suite/tokudb/t/card_unique_sk.test
+++ b/storage/tokudb/mysql-test/tokudb/t/card_unique_sk.test
diff --git a/mysql-test/suite/tokudb/t/change_column_Makefile b/storage/tokudb/mysql-test/tokudb/t/change_column_Makefile
index d1a692e0357..d1a692e0357 100644
--- a/mysql-test/suite/tokudb/t/change_column_Makefile
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_Makefile
diff --git a/mysql-test/suite/tokudb/t/change_column_all.py b/storage/tokudb/mysql-test/tokudb/t/change_column_all.py
index 04e7d143696..04e7d143696 100644
--- a/mysql-test/suite/tokudb/t/change_column_all.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_all.py
diff --git a/mysql-test/suite/tokudb/t/change_column_all_1000_1.test b/storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_1.test
index 92f5edc923b..92f5edc923b 100644
--- a/mysql-test/suite/tokudb/t/change_column_all_1000_1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_1.test
diff --git a/mysql-test/suite/tokudb/t/change_column_all_1000_10.test b/storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_10.test
index 5100bdc65fa..5100bdc65fa 100644
--- a/mysql-test/suite/tokudb/t/change_column_all_1000_10.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_all_1000_10.test
diff --git a/mysql-test/suite/tokudb/t/change_column_auto_inc.test b/storage/tokudb/mysql-test/tokudb/t/change_column_auto_inc.test
index c554f622111..c554f622111 100644
--- a/mysql-test/suite/tokudb/t/change_column_auto_inc.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_auto_inc.test
diff --git a/mysql-test/suite/tokudb/t/change_column_bin.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py
index 0ddee301d1b..0ddee301d1b 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py
diff --git a/mysql-test/suite/tokudb/t/change_column_bin.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test
index 0365c155302..0365c155302 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test
diff --git a/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_descriptor.test
index bda62ab3646..bda62ab3646 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_descriptor.test
diff --git a/mysql-test/suite/tokudb/t/change_column_bin_key.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_key.test
index c486f60b0a7..c486f60b0a7 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_key.test
diff --git a/mysql-test/suite/tokudb/t/change_column_bin_pad.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_pad.test
index 11ad567d3ac..11ad567d3ac 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin_pad.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_pad.test
diff --git a/mysql-test/suite/tokudb/t/change_column_bin_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py
index b574f15735a..b574f15735a 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin_rename.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py
diff --git a/mysql-test/suite/tokudb/t/change_column_bin_rename.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.test
index fc978cbf2e4..fc978cbf2e4 100644
--- a/mysql-test/suite/tokudb/t/change_column_bin_rename.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.test
diff --git a/mysql-test/suite/tokudb/t/change_column_blob.py b/storage/tokudb/mysql-test/tokudb/t/change_column_blob.py
index d884932307f..d884932307f 100644
--- a/mysql-test/suite/tokudb/t/change_column_blob.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_blob.py
diff --git a/mysql-test/suite/tokudb/t/change_column_blob.test b/storage/tokudb/mysql-test/tokudb/t/change_column_blob.test
index 585c943766f..585c943766f 100644
--- a/mysql-test/suite/tokudb/t/change_column_blob.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_blob.test
diff --git a/mysql-test/suite/tokudb/t/change_column_blob_data.py b/storage/tokudb/mysql-test/tokudb/t/change_column_blob_data.py
index 852675aa210..852675aa210 100644
--- a/mysql-test/suite/tokudb/t/change_column_blob_data.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_blob_data.py
diff --git a/mysql-test/suite/tokudb/t/change_column_blob_data.test b/storage/tokudb/mysql-test/tokudb/t/change_column_blob_data.test
index 9bf04e2aab9..9bf04e2aab9 100644
--- a/mysql-test/suite/tokudb/t/change_column_blob_data.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_blob_data.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py
index 99d99d1c017..99d99d1c017 100644
--- a/mysql-test/suite/tokudb/t/change_column_char.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py
diff --git a/mysql-test/suite/tokudb/t/change_column_char.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test
index 8a0b0a9abd8..8a0b0a9abd8 100644
--- a/mysql-test/suite/tokudb/t/change_column_char.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_binary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py
index 4b94d2fc98b..4b94d2fc98b 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_binary.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py
diff --git a/mysql-test/suite/tokudb/t/change_column_char_binary.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.test
index e30e7044f4a..e30e7044f4a 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_binary.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_charbinary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py
index 81cf2058a3e..81cf2058a3e 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_charbinary.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py
diff --git a/mysql-test/suite/tokudb/t/change_column_char_charbinary.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.test
index 31ab487fe02..31ab487fe02 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_charbinary.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_charset.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charset.test
index c1656b00695..c1656b00695 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_charset.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charset.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_default.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_default.test
index e4fd32b7148..e4fd32b7148 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_default.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_descriptor.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_descriptor.test
index ddfd2027bd4..ddfd2027bd4 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_descriptor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_descriptor.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_key.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_key.test
index c1d8a2b496b..c1d8a2b496b 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_key.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_null.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_null.test
index 1aec846dc79..1aec846dc79 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_null.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_null.test
diff --git a/mysql-test/suite/tokudb/t/change_column_char_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py
index 6bc8ae80c7d..6bc8ae80c7d 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_rename.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py
diff --git a/mysql-test/suite/tokudb/t/change_column_char_rename.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.test
index 03a87d7378e..03a87d7378e 100644
--- a/mysql-test/suite/tokudb/t/change_column_char_rename.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.test
diff --git a/mysql-test/suite/tokudb/t/change_column_delete_change_char_5674.test b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_char_5674.test
index b0f0188eb3d..b0f0188eb3d 100644
--- a/mysql-test/suite/tokudb/t/change_column_delete_change_char_5674.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_char_5674.test
diff --git a/mysql-test/suite/tokudb/t/change_column_delete_change_int_5674.test b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_int_5674.test
index 3698bb60ad9..3698bb60ad9 100644
--- a/mysql-test/suite/tokudb/t/change_column_delete_change_int_5674.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_int_5674.test
diff --git a/mysql-test/suite/tokudb/t/change_column_delete_change_varchar_5674.test b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_varchar_5674.test
index 7f92a2d6667..7f92a2d6667 100644
--- a/mysql-test/suite/tokudb/t/change_column_delete_change_varchar_5674.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_delete_change_varchar_5674.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int.py
index f93b9d7bb69..f93b9d7bb69 100644
--- a/mysql-test/suite/tokudb/t/change_column_int.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int.py
diff --git a/mysql-test/suite/tokudb/t/change_column_int.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int.test
index 27e609def63..27e609def63 100644
--- a/mysql-test/suite/tokudb/t/change_column_int.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int_default.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int_default.test
index f02e8fe6871..f02e8fe6871 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_default.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int_descriptor.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int_descriptor.test
index 1fdf6a08ebd..1fdf6a08ebd 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_descriptor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_descriptor.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int_key.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py
index 8b217b59ab1..8b217b59ab1 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_key.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py
diff --git a/mysql-test/suite/tokudb/t/change_column_int_key.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.test
index 0dd2fe07e74..0dd2fe07e74 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int_not_supported.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py
index 6fbb2343fea..6fbb2343fea 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_not_supported.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py
diff --git a/mysql-test/suite/tokudb/t/change_column_int_not_supported.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.test
index 2b6a8d76eac..2b6a8d76eac 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_not_supported.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.test
diff --git a/mysql-test/suite/tokudb/t/change_column_int_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py
index a1cd155f3de..a1cd155f3de 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_rename.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py
diff --git a/mysql-test/suite/tokudb/t/change_column_int_rename.test b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.test
index ce17dd1a21f..ce17dd1a21f 100644
--- a/mysql-test/suite/tokudb/t/change_column_int_rename.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.test
diff --git a/mysql-test/suite/tokudb/t/change_column_multiple_columns.py b/storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.py
index 7e562f38a0f..7e562f38a0f 100644
--- a/mysql-test/suite/tokudb/t/change_column_multiple_columns.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.py
diff --git a/mysql-test/suite/tokudb/t/change_column_multiple_columns.test b/storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.test
index 1b729bea92f..1b729bea92f 100644
--- a/mysql-test/suite/tokudb/t/change_column_multiple_columns.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_multiple_columns.test
diff --git a/mysql-test/suite/tokudb/t/change_column_text.py b/storage/tokudb/mysql-test/tokudb/t/change_column_text.py
index 13de13dc222..13de13dc222 100644
--- a/mysql-test/suite/tokudb/t/change_column_text.py
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_text.py
diff --git a/mysql-test/suite/tokudb/t/change_column_text.test b/storage/tokudb/mysql-test/tokudb/t/change_column_text.test
index cec49e2ba20..cec49e2ba20 100644
--- a/mysql-test/suite/tokudb/t/change_column_text.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_text.test
diff --git a/mysql-test/suite/tokudb/t/change_column_text_data.test b/storage/tokudb/mysql-test/tokudb/t/change_column_text_data.test
index 287b1e11ddd..287b1e11ddd 100644
--- a/mysql-test/suite/tokudb/t/change_column_text_data.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_text_data.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin.test
index 88fc0ce1837..88fc0ce1837 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_cross256.test
index e1600a22e25..e1600a22e25 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_cross256.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_default.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_default.test
index d8c88ba8afc..d8c88ba8afc 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_default.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_descriptor.test
index 7c247e8afe7..7c247e8afe7 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_descriptor.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_key.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_key.test
index d96104750f7..d96104750f7 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_key.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_multiple.test
index 84eea5ea561..84eea5ea561 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_multiple.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_null.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_null.test
index 2f95f2446c4..2f95f2446c4 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_null.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_null.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_rename.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_rename.test
index 1f424128bab..1f424128bab 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_rename.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_rename.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_varchar.test
index c226d2ac619..c226d2ac619 100644
--- a/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varbin_varchar.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar.test
index 6543952ad29..6543952ad29 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_charset.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_charset.test
index a84edf3dea1..a84edf3dea1 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_charset.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_charset.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_cross256.test
index 896160b26c5..896160b26c5 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_cross256.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_default.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_default.test
index f8240e97c5d..f8240e97c5d 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_default.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_descriptor.test
index 12840d29ef9..12840d29ef9 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_descriptor.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_key.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_key.test
index 2cd69548132..2cd69548132 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_key.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_null.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_null.test
index 3f194d6c381..3f194d6c381 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_null.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_null.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_a.test
index 202c3a47fc7..202c3a47fc7 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_a.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_b.test
index e8cd05418d9..e8cd05418d9 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_prefix_b.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_rename.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_rename.test
index 1692c4839b9..1692c4839b9 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_rename.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_rename.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_sum_cross256.test
index 02cf485bb0e..02cf485bb0e 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_sum_cross256.test
diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_varbin.test
index c1d30b4028c..c1d30b4028c 100644
--- a/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test
+++ b/storage/tokudb/mysql-test/tokudb/t/change_column_varchar_varbin.test
diff --git a/mysql-test/suite/tokudb/t/cluster_1829.test b/storage/tokudb/mysql-test/tokudb/t/cluster_1829.test
index 52762abb6a0..52762abb6a0 100644
--- a/mysql-test/suite/tokudb/t/cluster_1829.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_1829.test
diff --git a/mysql-test/suite/tokudb/t/cluster_2968-0.test b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-0.test
index a9645878a65..a9645878a65 100644
--- a/mysql-test/suite/tokudb/t/cluster_2968-0.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-0.test
diff --git a/mysql-test/suite/tokudb/t/cluster_2968-1.test b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-1.test
index 152cfa92604..152cfa92604 100644
--- a/mysql-test/suite/tokudb/t/cluster_2968-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-1.test
diff --git a/mysql-test/suite/tokudb/t/cluster_2968-2.test b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-2.test
index 3189942fba9..3189942fba9 100644
--- a/mysql-test/suite/tokudb/t/cluster_2968-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-2.test
diff --git a/mysql-test/suite/tokudb/t/cluster_2968-3.test b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-3.test
index d0a89c25340..d0a89c25340 100644
--- a/mysql-test/suite/tokudb/t/cluster_2968-3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_2968-3.test
diff --git a/mysql-test/suite/tokudb/t/cluster_create_table.test b/storage/tokudb/mysql-test/tokudb/t/cluster_create_table.test
index 1ad0a56a9a0..1ad0a56a9a0 100644
--- a/mysql-test/suite/tokudb/t/cluster_create_table.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_create_table.test
diff --git a/mysql-test/suite/tokudb/t/cluster_delete.test b/storage/tokudb/mysql-test/tokudb/t/cluster_delete.test
index 935924702e6..935924702e6 100644
--- a/mysql-test/suite/tokudb/t/cluster_delete.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_delete.test
diff --git a/mysql-test/suite/tokudb/t/cluster_delete2.test b/storage/tokudb/mysql-test/tokudb/t/cluster_delete2.test
index 5d7d41931ce..5d7d41931ce 100755
--- a/mysql-test/suite/tokudb/t/cluster_delete2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_delete2.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter.test
index ac6fe336407..ac6fe336407 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_hidden.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_hidden.test
index 30c13054eb4..30c13054eb4 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_hidden.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_hidden.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_key.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_key.test
index 192e56f10a1..192e56f10a1 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_key.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar.test
index 1af02e4888c..1af02e4888c 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test
index 35d83aff736..35d83aff736 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
index cb95a052d36..cb95a052d36 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
diff --git a/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_varchar_prefix.test
index 27e73ee383f..27e73ee383f 100755
--- a/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_varchar_prefix.test
diff --git a/mysql-test/suite/tokudb/t/cluster_key.test b/storage/tokudb/mysql-test/tokudb/t/cluster_key.test
index 9fbd33f6a99..9fbd33f6a99 100644
--- a/mysql-test/suite/tokudb/t/cluster_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_key.test
diff --git a/mysql-test/suite/tokudb/t/cluster_key_part.test b/storage/tokudb/mysql-test/tokudb/t/cluster_key_part.test
index b875b71fe00..b875b71fe00 100644
--- a/mysql-test/suite/tokudb/t/cluster_key_part.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_key_part.test
diff --git a/mysql-test/suite/tokudb/t/cluster_query_plan.test b/storage/tokudb/mysql-test/tokudb/t/cluster_query_plan.test
index 989d93728c1..989d93728c1 100644
--- a/mysql-test/suite/tokudb/t/cluster_query_plan.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_query_plan.test
diff --git a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test b/storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993.test
index b0d704e9af2..b0d704e9af2 100644
--- a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993.test
diff --git a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test b/storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993_2.test
index 7a8e2ba6eac..7a8e2ba6eac 100644
--- a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_tokudb_bug_993_2.test
diff --git a/mysql-test/suite/tokudb/t/cluster_update.test b/storage/tokudb/mysql-test/tokudb/t/cluster_update.test
index 194fd641fc0..194fd641fc0 100644
--- a/mysql-test/suite/tokudb/t/cluster_update.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_update.test
diff --git a/mysql-test/suite/tokudb/t/cluster_update2.test b/storage/tokudb/mysql-test/tokudb/t/cluster_update2.test
index aaa7a9e026e..aaa7a9e026e 100755
--- a/mysql-test/suite/tokudb/t/cluster_update2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_update2.test
diff --git a/mysql-test/suite/tokudb/t/ctype_ascii.test b/storage/tokudb/mysql-test/tokudb/t/ctype_ascii.test
index 26c89044d32..26c89044d32 100644
--- a/mysql-test/suite/tokudb/t/ctype_ascii.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ctype_ascii.test
diff --git a/mysql-test/suite/tokudb/t/ctype_collate.test b/storage/tokudb/mysql-test/tokudb/t/ctype_collate.test
index 76a6221da4e..76a6221da4e 100644
--- a/mysql-test/suite/tokudb/t/ctype_collate.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ctype_collate.test
diff --git a/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test b/storage/tokudb/mysql-test/tokudb/t/ctype_cp1250_ch.test
index 42aede8fa5e..42aede8fa5e 100644
--- a/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ctype_cp1250_ch.test
diff --git a/mysql-test/suite/tokudb/t/ctype_cp1251.test b/storage/tokudb/mysql-test/tokudb/t/ctype_cp1251.test
index 3b0f56893df..3b0f56893df 100644
--- a/mysql-test/suite/tokudb/t/ctype_cp1251.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ctype_cp1251.test
diff --git a/mysql-test/suite/tokudb/t/disabled.def b/storage/tokudb/mysql-test/tokudb/t/disabled.def
index 36e63bddab0..36e63bddab0 100644
--- a/mysql-test/suite/tokudb/t/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb/t/disabled.def
diff --git a/mysql-test/suite/tokudb/t/ext_key_1_innodb.test b/storage/tokudb/mysql-test/tokudb/t/ext_key_1_innodb.test
index 488ccc422e9..488ccc422e9 100644
--- a/mysql-test/suite/tokudb/t/ext_key_1_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ext_key_1_innodb.test
diff --git a/mysql-test/suite/tokudb/t/ext_key_1_tokudb.test b/storage/tokudb/mysql-test/tokudb/t/ext_key_1_tokudb.test
index 14a72a460e4..14a72a460e4 100644
--- a/mysql-test/suite/tokudb/t/ext_key_1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ext_key_1_tokudb.test
diff --git a/mysql-test/suite/tokudb/t/ext_key_2_innodb.test b/storage/tokudb/mysql-test/tokudb/t/ext_key_2_innodb.test
index bfb56faf48e..bfb56faf48e 100644
--- a/mysql-test/suite/tokudb/t/ext_key_2_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ext_key_2_innodb.test
diff --git a/mysql-test/suite/tokudb/t/ext_key_2_tokudb.test b/storage/tokudb/mysql-test/tokudb/t/ext_key_2_tokudb.test
index a088a16c0fd..a088a16c0fd 100644
--- a/mysql-test/suite/tokudb/t/ext_key_2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/ext_key_2_tokudb.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_Makefile b/storage/tokudb/mysql-test/tokudb/t/fast_update_Makefile
index 71956d1fe43..71956d1fe43 100644
--- a/mysql-test/suite/tokudb/t/fast_update_Makefile
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_Makefile
diff --git a/mysql-test/suite/tokudb/t/fast_update_binlog_mixed.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_mixed.test
index 28a11cf302c..28a11cf302c 100644
--- a/mysql-test/suite/tokudb/t/fast_update_binlog_mixed.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_mixed.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_binlog_row.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_row.test
index 6a8342eb4d9..6a8342eb4d9 100644
--- a/mysql-test/suite/tokudb/t/fast_update_binlog_row.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_row.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_binlog_statement.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_statement.test
index bab2aadb340..bab2aadb340 100644
--- a/mysql-test/suite/tokudb/t/fast_update_binlog_statement.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_binlog_statement.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs.py
index 06b89626120..06b89626120 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs.test
index 1c91116bc99..1c91116bc99 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs_fixed_varchar.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_fixed_varchar.py
index 6288b5b2a53..6288b5b2a53 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs_fixed_varchar.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_fixed_varchar.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs_fixed_varchar.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_fixed_varchar.test
index c4df1a29f39..c4df1a29f39 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs_fixed_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_fixed_varchar.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs_with_varchar.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_with_varchar.py
index 6eea11afd7b..6eea11afd7b 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs_with_varchar.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_with_varchar.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_blobs_with_varchar.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_with_varchar.test
index 0821c0c7a79..0821c0c7a79 100644
--- a/mysql-test/suite/tokudb/t/fast_update_blobs_with_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_blobs_with_varchar.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_char.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test
index 2ee6fbd79ee..2ee6fbd79ee 100644
--- a/mysql-test/suite/tokudb/t/fast_update_char.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_deadlock.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_deadlock.test
index 24221f85f75..24221f85f75 100644
--- a/mysql-test/suite/tokudb/t/fast_update_deadlock.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_deadlock.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_decr_floor.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_decr_floor.py
index 430d4c4f365..430d4c4f365 100644
--- a/mysql-test/suite/tokudb/t/fast_update_decr_floor.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_decr_floor.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_decr_floor.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_decr_floor.test
index 133331d3578..133331d3578 100644
--- a/mysql-test/suite/tokudb/t/fast_update_decr_floor.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_decr_floor.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_disable_slow_update.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_disable_slow_update.test
index 3fdca0a6edd..3fdca0a6edd 100644
--- a/mysql-test/suite/tokudb/t/fast_update_disable_slow_update.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_disable_slow_update.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_error.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_error.test
index dc7c4d277dc..dc7c4d277dc 100644
--- a/mysql-test/suite/tokudb/t/fast_update_error.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_error.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_int.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_int.py
index f6414f0ec5b..f6414f0ec5b 100644
--- a/mysql-test/suite/tokudb/t/fast_update_int.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_int.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_int.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_int.test
index e663cbfb8fd..e663cbfb8fd 100644
--- a/mysql-test/suite/tokudb/t/fast_update_int.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_int.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_int_bounds.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_int_bounds.test
index cf354243236..cf354243236 100644
--- a/mysql-test/suite/tokudb/t/fast_update_int_bounds.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_int_bounds.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_key.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_key.test
index 21f3cbf999a..21f3cbf999a 100644
--- a/mysql-test/suite/tokudb/t/fast_update_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_key.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_sqlmode.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_sqlmode.test
index 9eb7721b538..9eb7721b538 100644
--- a/mysql-test/suite/tokudb/t/fast_update_sqlmode.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_sqlmode.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_uint_bounds.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_uint_bounds.test
index f4f43d60e31..f4f43d60e31 100644
--- a/mysql-test/suite/tokudb/t/fast_update_uint_bounds.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_uint_bounds.test
diff --git a/mysql-test/suite/tokudb/t/fast_update_varchar.py b/storage/tokudb/mysql-test/tokudb/t/fast_update_varchar.py
index 54cc0050ee3..54cc0050ee3 100644
--- a/mysql-test/suite/tokudb/t/fast_update_varchar.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_varchar.py
diff --git a/mysql-test/suite/tokudb/t/fast_update_varchar.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_varchar.test
index b407f416a3b..b407f416a3b 100644
--- a/mysql-test/suite/tokudb/t/fast_update_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_varchar.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_bin_pad.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_bin_pad.test
index d1eb8500c55..d1eb8500c55 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_bin_pad.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_bin_pad.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_char.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_char.test
index aa06b3202e4..aa06b3202e4 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_char.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_char.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_deadlock.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_deadlock.test
index 66b212f3c24..66b212f3c24 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_deadlock.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_deadlock.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_int.py b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_int.py
index a19227ec20d..a19227ec20d 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_int.py
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_int.py
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_int.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_int.test
index 9f44f6b461c..9f44f6b461c 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_int.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_int.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_key.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_key.test
index c11f2f49176..c11f2f49176 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_key.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_key.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_sqlmode.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test
index b83918d3412..b83918d3412 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_sqlmode.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test
diff --git a/mysql-test/suite/tokudb/t/fast_upsert_values.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_values.test
index cd258836ffb..cd258836ffb 100644
--- a/mysql-test/suite/tokudb/t/fast_upsert_values.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_values.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-del-0.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-0.test
index 4ebb8476538..4ebb8476538 100644
--- a/mysql-test/suite/tokudb/t/hotindex-del-0.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-0.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-del-1.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-1.test
index b46aee575ed..b46aee575ed 100644
--- a/mysql-test/suite/tokudb/t/hotindex-del-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-1.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-del-fast.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-fast.test
index 63c3cafda43..63c3cafda43 100644
--- a/mysql-test/suite/tokudb/t/hotindex-del-fast.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-fast.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-del-slow.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-slow.test
index 445b18b5d24..445b18b5d24 100644
--- a/mysql-test/suite/tokudb/t/hotindex-del-slow.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-del-slow.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-0.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-0.test
index c54c2d6e471..c54c2d6e471 100644
--- a/mysql-test/suite/tokudb/t/hotindex-insert-0.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-0.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-1.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-1.test
index f90b4d04ad8..f90b4d04ad8 100644
--- a/mysql-test/suite/tokudb/t/hotindex-insert-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-1.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-2.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-2.test
index 2496b72ee48..2496b72ee48 100644
--- a/mysql-test/suite/tokudb/t/hotindex-insert-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-2.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-bigchar.test
index 1f2619b476e..1f2619b476e 100644
--- a/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-insert-bigchar.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-update-0.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-update-0.test
index 92f0ea3c459..92f0ea3c459 100644
--- a/mysql-test/suite/tokudb/t/hotindex-update-0.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-update-0.test
diff --git a/mysql-test/suite/tokudb/t/hotindex-update-1.test b/storage/tokudb/mysql-test/tokudb/t/hotindex-update-1.test
index c8ecbaf4bf0..c8ecbaf4bf0 100644
--- a/mysql-test/suite/tokudb/t/hotindex-update-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/hotindex-update-1.test
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
index bd2257fbaed..bd2257fbaed 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
index 06923d4ca58..06923d4ca58 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks.test
index e5a67559b1a..e5a67559b1a 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks.test
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
index 4d654244682..4d654244682 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_trx.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
index d3c2636ba54..d3c2636ba54 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_trx.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
diff --git a/mysql-test/suite/tokudb/t/information-schema-global-status.test b/storage/tokudb/mysql-test/tokudb/t/information-schema-global-status.test
index d984862b00a..d984862b00a 100644
--- a/mysql-test/suite/tokudb/t/information-schema-global-status.test
+++ b/storage/tokudb/mysql-test/tokudb/t/information-schema-global-status.test
diff --git a/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test b/storage/tokudb/mysql-test/tokudb/t/lockretry-insert.writelocktable.test
index b25449cc3c4..b25449cc3c4 100644
--- a/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test
+++ b/storage/tokudb/mysql-test/tokudb/t/lockretry-insert.writelocktable.test
diff --git a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test b/storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert.test
index 6f3a7b73b5c..6f3a7b73b5c 100644
--- a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test
+++ b/storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert.test
diff --git a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test b/storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert2.test
index 4f80484b907..4f80484b907 100644
--- a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/lockretry-writelocktable.insert2.test
diff --git a/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test b/storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks-getset.test
index a2fb427fac2..a2fb427fac2 100644
--- a/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks-getset.test
diff --git a/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test b/storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks.test
index 008770c6083..008770c6083 100644
--- a/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-blocking-row-locks.test
diff --git a/mysql-test/suite/tokudb/t/locks-border-locks.notyet.3981 b/storage/tokudb/mysql-test/tokudb/t/locks-border-locks.notyet.3981
index 016e7f57216..016e7f57216 100644
--- a/mysql-test/suite/tokudb/t/locks-border-locks.notyet.3981
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-border-locks.notyet.3981
diff --git a/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test b/storage/tokudb/mysql-test/tokudb/t/locks-delete-deadlock-1.test
index 7a39c04f8ca..7a39c04f8ca 100644
--- a/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-delete-deadlock-1.test
diff --git a/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test b/storage/tokudb/mysql-test/tokudb/t/locks-no-read-lock-serializable-autocommit.test
index 0db1424f754..0db1424f754 100644
--- a/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-no-read-lock-serializable-autocommit.test
diff --git a/mysql-test/suite/tokudb/t/locks-select-update-1.test b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-1.test
index 1f8fb039092..1f8fb039092 100644
--- a/mysql-test/suite/tokudb/t/locks-select-update-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-1.test
diff --git a/mysql-test/suite/tokudb/t/locks-select-update-2.test b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-2.test
index 0945fc39e58..0945fc39e58 100644
--- a/mysql-test/suite/tokudb/t/locks-select-update-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-2.test
diff --git a/mysql-test/suite/tokudb/t/locks-select-update-3.test b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test
index a563f061add..a563f061add 100644
--- a/mysql-test/suite/tokudb/t/locks-select-update-3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test
diff --git a/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test b/storage/tokudb/mysql-test/tokudb/t/locks-update-deadlock-1.test
index a9c90862b71..a9c90862b71 100644
--- a/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/locks-update-deadlock-1.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-1.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-1.test
index dd9bb3f66f8..dd9bb3f66f8 100755
--- a/mysql-test/suite/tokudb/t/mvcc-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-1.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-10.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-10.test
index 6aff3976dfc..6aff3976dfc 100755
--- a/mysql-test/suite/tokudb/t/mvcc-10.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-10.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-11.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-11.test
index 9daafe94207..9daafe94207 100755
--- a/mysql-test/suite/tokudb/t/mvcc-11.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-11.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-12.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-12.test
index 8fd445677b4..8fd445677b4 100755
--- a/mysql-test/suite/tokudb/t/mvcc-12.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-12.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-13.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-13.test
index bbaa0769b0d..bbaa0769b0d 100755
--- a/mysql-test/suite/tokudb/t/mvcc-13.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-13.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-14.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-14.test
index d01d033102e..d01d033102e 100755
--- a/mysql-test/suite/tokudb/t/mvcc-14.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-14.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-15.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-15.test
index 292c87aebce..292c87aebce 100755
--- a/mysql-test/suite/tokudb/t/mvcc-15.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-15.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-16.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-16.test
index 1ea295998fe..1ea295998fe 100755
--- a/mysql-test/suite/tokudb/t/mvcc-16.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-16.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-17.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-17.test
index 3e2a84f84a6..3e2a84f84a6 100755
--- a/mysql-test/suite/tokudb/t/mvcc-17.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-17.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-18.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-18.test
index 734a8502f66..734a8502f66 100755
--- a/mysql-test/suite/tokudb/t/mvcc-18.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-18.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-19.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-19.test
index ac8087c4c1f..ac8087c4c1f 100755
--- a/mysql-test/suite/tokudb/t/mvcc-19.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-19.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-2.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-2.test
index e9bc2d782ce..e9bc2d782ce 100755
--- a/mysql-test/suite/tokudb/t/mvcc-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-2.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-20.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-20.test
index 03bd7abd031..03bd7abd031 100755
--- a/mysql-test/suite/tokudb/t/mvcc-20.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-20.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-21.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-21.test
index 502383d2bb8..502383d2bb8 100755
--- a/mysql-test/suite/tokudb/t/mvcc-21.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-21.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-22.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-22.test
index b9c4d94e341..b9c4d94e341 100755
--- a/mysql-test/suite/tokudb/t/mvcc-22.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-22.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-23.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-23.test
index 7ab1778599b..7ab1778599b 100755
--- a/mysql-test/suite/tokudb/t/mvcc-23.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-23.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-24.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-24.test
index ff13500e663..ff13500e663 100755
--- a/mysql-test/suite/tokudb/t/mvcc-24.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-24.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-25.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-25.test
index fc0198d7a35..fc0198d7a35 100755
--- a/mysql-test/suite/tokudb/t/mvcc-25.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-25.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-26.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-26.test
index 7711b3105ce..7711b3105ce 100755
--- a/mysql-test/suite/tokudb/t/mvcc-26.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-26.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-27.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-27.test
index b6a146582a7..b6a146582a7 100755
--- a/mysql-test/suite/tokudb/t/mvcc-27.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-27.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-28.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-28.test
index b668ed77716..b668ed77716 100755
--- a/mysql-test/suite/tokudb/t/mvcc-28.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-28.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-committed.test
index 11c879ba6d8..11c879ba6d8 100755
--- a/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-committed.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-2808-read-uncommitted.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-uncommitted.test
index d4bf6beb7d2..d4bf6beb7d2 100755
--- a/mysql-test/suite/tokudb/t/mvcc-2808-read-uncommitted.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-2808-read-uncommitted.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-29.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-29.test
index 115063ec3fe..115063ec3fe 100755
--- a/mysql-test/suite/tokudb/t/mvcc-29.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-29.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-3.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-3.test
index 7187ed75842..7187ed75842 100755
--- a/mysql-test/suite/tokudb/t/mvcc-3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-3.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-30.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-30.test
index 6455d75a2eb..6455d75a2eb 100755
--- a/mysql-test/suite/tokudb/t/mvcc-30.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-30.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-31.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-31.test
index 2fe15a9ef6e..2fe15a9ef6e 100755
--- a/mysql-test/suite/tokudb/t/mvcc-31.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-31.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-33.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-33.test
index 13be98199b6..13be98199b6 100755
--- a/mysql-test/suite/tokudb/t/mvcc-33.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-33.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-34.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-34.test
index 308701d5ed7..308701d5ed7 100755
--- a/mysql-test/suite/tokudb/t/mvcc-34.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-34.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-35.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-35.test
index 541634179ca..541634179ca 100755
--- a/mysql-test/suite/tokudb/t/mvcc-35.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-35.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-36.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-36.test
index fe289a408b9..fe289a408b9 100755
--- a/mysql-test/suite/tokudb/t/mvcc-36.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-36.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-37.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-37.test
index 9965037b76d..9965037b76d 100755
--- a/mysql-test/suite/tokudb/t/mvcc-37.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-37.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-38.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-38.test
index f1788d84466..f1788d84466 100755
--- a/mysql-test/suite/tokudb/t/mvcc-38.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-38.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-39.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-39.test
index b495adaec15..b495adaec15 100755
--- a/mysql-test/suite/tokudb/t/mvcc-39.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-39.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-4.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-4.test
index 525119549c7..525119549c7 100755
--- a/mysql-test/suite/tokudb/t/mvcc-4.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-4.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-40.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-40.test
index 8f3b40e8430..8f3b40e8430 100755
--- a/mysql-test/suite/tokudb/t/mvcc-40.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-40.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-5.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-5.test
index fda703e3467..fda703e3467 100755
--- a/mysql-test/suite/tokudb/t/mvcc-5.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-5.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-6.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-6.test
index 5222420aeae..5222420aeae 100755
--- a/mysql-test/suite/tokudb/t/mvcc-6.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-6.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-7.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-7.test
index c95e471cd1e..c95e471cd1e 100755
--- a/mysql-test/suite/tokudb/t/mvcc-7.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-7.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-8.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-8.test
index 5560596f9ce..5560596f9ce 100755
--- a/mysql-test/suite/tokudb/t/mvcc-8.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-8.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-9.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-9.test
index 2cc78e2894e..2cc78e2894e 100755
--- a/mysql-test/suite/tokudb/t/mvcc-9.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-9.test
diff --git a/mysql-test/suite/tokudb/t/mvcc-checksum-locks.test b/storage/tokudb/mysql-test/tokudb/t/mvcc-checksum-locks.test
index 91b08d8afec..91b08d8afec 100755
--- a/mysql-test/suite/tokudb/t/mvcc-checksum-locks.test
+++ b/storage/tokudb/mysql-test/tokudb/t/mvcc-checksum-locks.test
diff --git a/mysql-test/suite/tokudb/t/nested_txn_autocommit.test b/storage/tokudb/mysql-test/tokudb/t/nested_txn_autocommit.test
index 4efc3838130..4efc3838130 100755
--- a/mysql-test/suite/tokudb/t/nested_txn_autocommit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/nested_txn_autocommit.test
diff --git a/mysql-test/suite/tokudb/t/nested_txn_begin.test b/storage/tokudb/mysql-test/tokudb/t/nested_txn_begin.test
index 5b902ff6de6..5b902ff6de6 100755
--- a/mysql-test/suite/tokudb/t/nested_txn_begin.test
+++ b/storage/tokudb/mysql-test/tokudb/t/nested_txn_begin.test
diff --git a/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test b/storage/tokudb/mysql-test/tokudb/t/nested_txn_implicit_commit.test
index 3be67aa7de3..3be67aa7de3 100755
--- a/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/nested_txn_implicit_commit.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_1.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_1.test
index adb1f944fd9..adb1f944fd9 100644
--- a/mysql-test/suite/tokudb/t/prim_key_1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_1.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_2.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_2.test
index fa05b5d91b5..fa05b5d91b5 100644
--- a/mysql-test/suite/tokudb/t/prim_key_2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_2.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_3.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_3.test
index 11851035c27..11851035c27 100644
--- a/mysql-test/suite/tokudb/t/prim_key_3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_3.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_4.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_4.test
index b323380a4dd..b323380a4dd 100644
--- a/mysql-test/suite/tokudb/t/prim_key_4.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_4.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_5.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_5.test
index c8c152170ee..c8c152170ee 100644
--- a/mysql-test/suite/tokudb/t/prim_key_5.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_5.test
diff --git a/mysql-test/suite/tokudb/t/prim_key_6.test b/storage/tokudb/mysql-test/tokudb/t/prim_key_6.test
index 548e660fe8f..548e660fe8f 100644
--- a/mysql-test/suite/tokudb/t/prim_key_6.test
+++ b/storage/tokudb/mysql-test/tokudb/t/prim_key_6.test
diff --git a/mysql-test/suite/tokudb/t/replace-ignore.test b/storage/tokudb/mysql-test/tokudb/t/replace-ignore.test
index 5b95ac7db63..5b95ac7db63 100644
--- a/mysql-test/suite/tokudb/t/replace-ignore.test
+++ b/storage/tokudb/mysql-test/tokudb/t/replace-ignore.test
diff --git a/mysql-test/suite/tokudb/t/rows-32m-0.test b/storage/tokudb/mysql-test/tokudb/t/rows-32m-0.test
index 58a5ac1b8e3..58a5ac1b8e3 100644
--- a/mysql-test/suite/tokudb/t/rows-32m-0.test
+++ b/storage/tokudb/mysql-test/tokudb/t/rows-32m-0.test
diff --git a/mysql-test/suite/tokudb/t/rows-32m-1.test b/storage/tokudb/mysql-test/tokudb/t/rows-32m-1.test
index 39feddf77be..39feddf77be 100644
--- a/mysql-test/suite/tokudb/t/rows-32m-1.test
+++ b/storage/tokudb/mysql-test/tokudb/t/rows-32m-1.test
diff --git a/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test b/storage/tokudb/mysql-test/tokudb/t/rows-32m-rand-insert.test
index 89a1fd97fec..89a1fd97fec 100644
--- a/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test
+++ b/storage/tokudb/mysql-test/tokudb/t/rows-32m-rand-insert.test
diff --git a/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test b/storage/tokudb/mysql-test/tokudb/t/rows-32m-seq-insert.test
index 7ee84c69eca..7ee84c69eca 100644
--- a/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test
+++ b/storage/tokudb/mysql-test/tokudb/t/rows-32m-seq-insert.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-1078-2.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-2.test
index a5dd6e4f527..a5dd6e4f527 100755
--- a/mysql-test/suite/tokudb/t/savepoint-1078-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-2.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-1078-3.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-3.test
index 3058d26e3af..3058d26e3af 100755
--- a/mysql-test/suite/tokudb/t/savepoint-1078-3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-3.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-1078-4.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-4.test
index 51fa711878e..51fa711878e 100755
--- a/mysql-test/suite/tokudb/t/savepoint-1078-4.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078-4.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-1078.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078.test
index 1c6f56b9e2b..1c6f56b9e2b 100755
--- a/mysql-test/suite/tokudb/t/savepoint-1078.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-1078.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-2.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-2.test
index b14da6a3c54..b14da6a3c54 100755
--- a/mysql-test/suite/tokudb/t/savepoint-2.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-2.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-3.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-3.test
index 8fff8ab498d..8fff8ab498d 100755
--- a/mysql-test/suite/tokudb/t/savepoint-3.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-3.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-4.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-4.test
index 7925a1b3bbd..7925a1b3bbd 100755
--- a/mysql-test/suite/tokudb/t/savepoint-4.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-4.test
diff --git a/mysql-test/suite/tokudb/t/savepoint-5.test b/storage/tokudb/mysql-test/tokudb/t/savepoint-5.test
index 4a1094c4ba2..4a1094c4ba2 100755
--- a/mysql-test/suite/tokudb/t/savepoint-5.test
+++ b/storage/tokudb/mysql-test/tokudb/t/savepoint-5.test
diff --git a/mysql-test/suite/tokudb/t/simple_delete_all.test b/storage/tokudb/mysql-test/tokudb/t/simple_delete_all.test
index f4a0c782b98..f4a0c782b98 100644
--- a/mysql-test/suite/tokudb/t/simple_delete_all.test
+++ b/storage/tokudb/mysql-test/tokudb/t/simple_delete_all.test
diff --git a/mysql-test/suite/tokudb/t/simple_join_tokudb_innodb.test b/storage/tokudb/mysql-test/tokudb/t/simple_join_tokudb_innodb.test
index 0b45248bc29..0b45248bc29 100644
--- a/mysql-test/suite/tokudb/t/simple_join_tokudb_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/simple_join_tokudb_innodb.test
diff --git a/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test b/storage/tokudb/mysql-test/tokudb/t/simple_join_tokudb_myisam.test
index 77fc4afcb51..77fc4afcb51 100644
--- a/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test
+++ b/storage/tokudb/mysql-test/tokudb/t/simple_join_tokudb_myisam.test
diff --git a/mysql-test/suite/tokudb/t/simple_truncate.test b/storage/tokudb/mysql-test/tokudb/t/simple_truncate.test
index 57eace950a4..57eace950a4 100644
--- a/mysql-test/suite/tokudb/t/simple_truncate.test
+++ b/storage/tokudb/mysql-test/tokudb/t/simple_truncate.test
diff --git a/mysql-test/suite/tokudb/t/sql_mode_default.test b/storage/tokudb/mysql-test/tokudb/t/sql_mode_default.test
index 5a1f28cc990..5a1f28cc990 100644
--- a/mysql-test/suite/tokudb/t/sql_mode_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/sql_mode_default.test
diff --git a/mysql-test/suite/tokudb/t/storage_engine_default.test b/storage/tokudb/mysql-test/tokudb/t/storage_engine_default.test
index 8205d163464..8205d163464 100644
--- a/mysql-test/suite/tokudb/t/storage_engine_default.test
+++ b/storage/tokudb/mysql-test/tokudb/t/storage_engine_default.test
diff --git a/mysql-test/suite/tokudb.add_index/t/suite.opt b/storage/tokudb/mysql-test/tokudb/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.add_index/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb/t/suite.opt
diff --git a/mysql-test/suite/tokudb/t/tokudb_support_xa.test b/storage/tokudb/mysql-test/tokudb/t/tokudb_support_xa.test
index f0ad03b91ee..f0ad03b91ee 100644
--- a/mysql-test/suite/tokudb/t/tokudb_support_xa.test
+++ b/storage/tokudb/mysql-test/tokudb/t/tokudb_support_xa.test
diff --git a/mysql-test/suite/tokudb/t/truncate_row_count.test b/storage/tokudb/mysql-test/tokudb/t/truncate_row_count.test
index fea4d67eba4..fea4d67eba4 100644
--- a/mysql-test/suite/tokudb/t/truncate_row_count.test
+++ b/storage/tokudb/mysql-test/tokudb/t/truncate_row_count.test
diff --git a/mysql-test/suite/tokudb/t/truncate_txn_commit.test b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_commit.test
index 2a8cc3ab16b..2a8cc3ab16b 100644
--- a/mysql-test/suite/tokudb/t/truncate_txn_commit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_commit.test
diff --git a/mysql-test/suite/tokudb/t/truncate_txn_rollback.test b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_rollback.test
index 98d4b9c80e5..98d4b9c80e5 100644
--- a/mysql-test/suite/tokudb/t/truncate_txn_rollback.test
+++ b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_rollback.test
diff --git a/mysql-test/suite/tokudb/t/truncate_txn_rollback_innodb.test b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_rollback_innodb.test
index 4c27322981f..4c27322981f 100644
--- a/mysql-test/suite/tokudb/t/truncate_txn_rollback_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/truncate_txn_rollback_innodb.test
diff --git a/mysql-test/suite/tokudb/t/type_binary.test b/storage/tokudb/mysql-test/tokudb/t/type_binary.test
index dfd8bc87741..dfd8bc87741 100644
--- a/mysql-test/suite/tokudb/t/type_binary.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_binary.test
diff --git a/mysql-test/suite/tokudb/t/type_bit.test b/storage/tokudb/mysql-test/tokudb/t/type_bit.test
index dbb0b4d88dd..dbb0b4d88dd 100644
--- a/mysql-test/suite/tokudb/t/type_bit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_bit.test
diff --git a/mysql-test/suite/tokudb/t/type_bit_innodb.test b/storage/tokudb/mysql-test/tokudb/t/type_bit_innodb.test
index e31e2fc719e..e31e2fc719e 100644
--- a/mysql-test/suite/tokudb/t/type_bit_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_bit_innodb.test
diff --git a/mysql-test/suite/tokudb/t/type_blob.test b/storage/tokudb/mysql-test/tokudb/t/type_blob.test
index 4ea452ab732..4ea452ab732 100644
--- a/mysql-test/suite/tokudb/t/type_blob.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_blob.test
diff --git a/mysql-test/suite/tokudb/t/type_date.test b/storage/tokudb/mysql-test/tokudb/t/type_date.test
index 37b0f72df21..37b0f72df21 100644
--- a/mysql-test/suite/tokudb/t/type_date.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_date.test
diff --git a/mysql-test/suite/tokudb/t/type_datetime.test b/storage/tokudb/mysql-test/tokudb/t/type_datetime.test
index ab016a88feb..ab016a88feb 100644
--- a/mysql-test/suite/tokudb/t/type_datetime.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_datetime.test
diff --git a/mysql-test/suite/tokudb/t/type_decimal.test b/storage/tokudb/mysql-test/tokudb/t/type_decimal.test
index 5ced2d0fe01..5ced2d0fe01 100644
--- a/mysql-test/suite/tokudb/t/type_decimal.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_decimal.test
diff --git a/mysql-test/suite/tokudb/t/type_enum.test b/storage/tokudb/mysql-test/tokudb/t/type_enum.test
index 80022229d9e..80022229d9e 100644
--- a/mysql-test/suite/tokudb/t/type_enum.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_enum.test
diff --git a/mysql-test/suite/tokudb/t/type_float.test b/storage/tokudb/mysql-test/tokudb/t/type_float.test
index 8c83913f1c8..8c83913f1c8 100644
--- a/mysql-test/suite/tokudb/t/type_float.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_float.test
diff --git a/mysql-test/suite/tokudb/t/type_nchar.test b/storage/tokudb/mysql-test/tokudb/t/type_nchar.test
index 466b1f22964..466b1f22964 100644
--- a/mysql-test/suite/tokudb/t/type_nchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_nchar.test
diff --git a/mysql-test/suite/tokudb/t/type_newdecimal-big.test b/storage/tokudb/mysql-test/tokudb/t/type_newdecimal-big.test
index 4ecced8df94..4ecced8df94 100644
--- a/mysql-test/suite/tokudb/t/type_newdecimal-big.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_newdecimal-big.test
diff --git a/mysql-test/suite/tokudb/t/type_newdecimal.test b/storage/tokudb/mysql-test/tokudb/t/type_newdecimal.test
index 6047993e1ad..6047993e1ad 100644
--- a/mysql-test/suite/tokudb/t/type_newdecimal.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_newdecimal.test
diff --git a/mysql-test/suite/tokudb/t/type_ranges.test b/storage/tokudb/mysql-test/tokudb/t/type_ranges.test
index 06a78900d57..06a78900d57 100644
--- a/mysql-test/suite/tokudb/t/type_ranges.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_ranges.test
diff --git a/mysql-test/suite/tokudb/t/type_set.test b/storage/tokudb/mysql-test/tokudb/t/type_set.test
index b054e04a90f..b054e04a90f 100644
--- a/mysql-test/suite/tokudb/t/type_set.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_set.test
diff --git a/mysql-test/suite/tokudb/t/type_temporal_fractional.test b/storage/tokudb/mysql-test/tokudb/t/type_temporal_fractional.test
index 2b2c4f57e5d..2b2c4f57e5d 100644
--- a/mysql-test/suite/tokudb/t/type_temporal_fractional.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_temporal_fractional.test
diff --git a/mysql-test/suite/tokudb/t/type_temporal_upgrade.test b/storage/tokudb/mysql-test/tokudb/t/type_temporal_upgrade.test
index 70384123c43..70384123c43 100644
--- a/mysql-test/suite/tokudb/t/type_temporal_upgrade.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_temporal_upgrade.test
diff --git a/mysql-test/suite/tokudb/t/type_time.test b/storage/tokudb/mysql-test/tokudb/t/type_time.test
index f7d061987dc..f7d061987dc 100644
--- a/mysql-test/suite/tokudb/t/type_time.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_time.test
diff --git a/mysql-test/suite/tokudb/t/type_timestamp-master.opt b/storage/tokudb/mysql-test/tokudb/t/type_timestamp-master.opt
index 608ab0029d5..608ab0029d5 100644
--- a/mysql-test/suite/tokudb/t/type_timestamp-master.opt
+++ b/storage/tokudb/mysql-test/tokudb/t/type_timestamp-master.opt
diff --git a/mysql-test/suite/tokudb/t/type_timestamp.test b/storage/tokudb/mysql-test/tokudb/t/type_timestamp.test
index 7b9a1d0bece..7b9a1d0bece 100644
--- a/mysql-test/suite/tokudb/t/type_timestamp.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_timestamp.test
diff --git a/mysql-test/suite/tokudb/t/type_timestamp_explicit-master.opt b/storage/tokudb/mysql-test/tokudb/t/type_timestamp_explicit-master.opt
index 92a881bef67..92a881bef67 100644
--- a/mysql-test/suite/tokudb/t/type_timestamp_explicit-master.opt
+++ b/storage/tokudb/mysql-test/tokudb/t/type_timestamp_explicit-master.opt
diff --git a/mysql-test/suite/tokudb/t/type_timestamp_explicit.test b/storage/tokudb/mysql-test/tokudb/t/type_timestamp_explicit.test
index 11528df2b50..11528df2b50 100644
--- a/mysql-test/suite/tokudb/t/type_timestamp_explicit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_timestamp_explicit.test
diff --git a/mysql-test/suite/tokudb/t/type_uint.test b/storage/tokudb/mysql-test/tokudb/t/type_uint.test
index d94e81e05d1..d94e81e05d1 100644
--- a/mysql-test/suite/tokudb/t/type_uint.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_uint.test
diff --git a/mysql-test/suite/tokudb/t/type_varchar.test b/storage/tokudb/mysql-test/tokudb/t/type_varchar.test
index 5becbf138a3..5becbf138a3 100644
--- a/mysql-test/suite/tokudb/t/type_varchar.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_varchar.test
diff --git a/mysql-test/suite/tokudb/t/type_year.test b/storage/tokudb/mysql-test/tokudb/t/type_year.test
index 048758268c8..048758268c8 100644
--- a/mysql-test/suite/tokudb/t/type_year.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_year.test
diff --git a/mysql-test/suite/tokudb.add_index/r/1522.result b/storage/tokudb/mysql-test/tokudb_add_index/r/1522.result
index fcf847291cd..fcf847291cd 100755
--- a/mysql-test/suite/tokudb.add_index/r/1522.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/1522.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_1.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_1.result
index d3fb4e0bc35..d3fb4e0bc35 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_1.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_1.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_10.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_10.result
index e297e0b1190..e297e0b1190 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_10.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_10.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_11.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_11.result
index 9ea63f9a1d1..9ea63f9a1d1 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_11.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_11.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_12.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_12.result
index b6d4700462f..b6d4700462f 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_12.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_12.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_13.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_13.result
index 799ae8f6279..799ae8f6279 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_13.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_13.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_14.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_14.result
index 96a3b51bc4c..96a3b51bc4c 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_14.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_14.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_15.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_15.result
index bab30929fc1..bab30929fc1 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_15.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_15.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_16.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_16.result
index 573f8245749..573f8245749 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_16.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_16.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_17.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_17.result
index 7ffa6f5cc08..7ffa6f5cc08 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_17.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_17.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_18.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_18.result
index 94b43b9b4da..94b43b9b4da 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_18.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_18.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_2.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_2.result
index 56d90fdad34..56d90fdad34 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_2.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_2.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_3.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_3.result
index f05bfb6564a..f05bfb6564a 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_3.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_3.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_4.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_4.result
index 8e5fcef82dc..8e5fcef82dc 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_4.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_4.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_5.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_5.result
index 6c286e8fa7c..6c286e8fa7c 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_5.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_5.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_6.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
index c198a6b4d7d..c198a6b4d7d 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_6.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_7.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_7.result
index cf1311dd891..cf1311dd891 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_7.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_7.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_8.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_8.result
index e6a09c9054c..e6a09c9054c 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_8.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_8.result
diff --git a/mysql-test/suite/tokudb.add_index/r/add_index_9.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_9.result
index c9da4694502..c9da4694502 100644
--- a/mysql-test/suite/tokudb.add_index/r/add_index_9.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_9.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_22516.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_22516.result
index c528fb65ab0..c528fb65ab0 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_22516.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_22516.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23691.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23691.result
index 68cb98da83f..68cb98da83f 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23691.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23691.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23692.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23692.result
index a0af9088e88..a0af9088e88 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23692.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23692.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_1.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_1.result
index e7920c449c4..e7920c449c4 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_1.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_1.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_2.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_2.result
index f935df7fb21..f935df7fb21 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_2.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_2.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_A.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_A.result
index 6b3f4e0de42..6b3f4e0de42 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_A.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_A.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_B.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_B.result
index 3be821555c0..3be821555c0 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_B.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_B.result
diff --git a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_C.result b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_C.result
index 9035c53b0c7..9035c53b0c7 100644
--- a/mysql-test/suite/tokudb.add_index/r/falcon_bug_23818_C.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/falcon_bug_23818_C.result
diff --git a/mysql-test/suite/tokudb.add_index/r/hot_create_unique_index.result b/storage/tokudb/mysql-test/tokudb_add_index/r/hot_create_unique_index.result
index 9d187d8bed6..9d187d8bed6 100644
--- a/mysql-test/suite/tokudb.add_index/r/hot_create_unique_index.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/hot_create_unique_index.result
diff --git a/mysql-test/suite/tokudb.add_index/r/tokudb_bug_1152.result b/storage/tokudb/mysql-test/tokudb_add_index/r/tokudb_bug_1152.result
index b7f734ac77a..b7f734ac77a 100644
--- a/mysql-test/suite/tokudb.add_index/r/tokudb_bug_1152.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/tokudb_bug_1152.result
diff --git a/mysql-test/suite/tokudb.add_index/t/1522.test b/storage/tokudb/mysql-test/tokudb_add_index/t/1522.test
index bbcc9f3a01b..bbcc9f3a01b 100644
--- a/mysql-test/suite/tokudb.add_index/t/1522.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/1522.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_1.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_1.test
index 950b97e5b44..950b97e5b44 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_1.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_1.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_10.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_10.test
index 30eaffb5ce2..30eaffb5ce2 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_10.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_10.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_11.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_11.test
index 1c06c370044..1c06c370044 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_11.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_11.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_12.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_12.test
index 0cadd79f87c..0cadd79f87c 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_12.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_12.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_13.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_13.test
index 3efbe8d6d2f..3efbe8d6d2f 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_13.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_13.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_14.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_14.test
index e5e62a41f86..e5e62a41f86 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_14.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_14.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_15.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_15.test
index 5a882dafea8..5a882dafea8 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_15.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_15.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_16.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_16.test
index 3fc4a01afbb..3fc4a01afbb 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_16.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_16.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_17.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_17.test
index fdbdcbdb34f..fdbdcbdb34f 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_17.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_17.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_18.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_18.test
index 618815015bf..618815015bf 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_18.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_18.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_2.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_2.test
index 889c35c67a5..889c35c67a5 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_2.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_2.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_3.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_3.test
index ae7c650babc..ae7c650babc 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_3.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_3.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_4.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_4.test
index 24ce67390e8..24ce67390e8 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_4.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_4.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_5.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_5.test
index 308821e459b..308821e459b 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_5.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_5.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_6.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
index 7acb727a8ea..7acb727a8ea 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_6.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_7.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_7.test
index ef35fb83ee9..ef35fb83ee9 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_7.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_7.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_8.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_8.test
index 5a0480b0f27..5a0480b0f27 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_8.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_8.test
diff --git a/mysql-test/suite/tokudb.add_index/t/add_index_9.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_9.test
index 0e0ac3430e1..0e0ac3430e1 100644
--- a/mysql-test/suite/tokudb.add_index/t/add_index_9.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_9.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_22516.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_22516.test
index e936dca144d..e936dca144d 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_22516.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_22516.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23691.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23691.test
index cc26965efbe..cc26965efbe 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23691.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23691.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23692.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23692.test
index de9b8793f4e..de9b8793f4e 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23692.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23692.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_1.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_1.test
index e23dbdb9915..e23dbdb9915 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_1.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_1.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_2.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_2.test
index 3fe72587fa8..3fe72587fa8 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_2.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_2.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_A.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_A.test
index f4a931dbe81..f4a931dbe81 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_A.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_A.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_B.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_B.test
index 96612a99804..96612a99804 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_B.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_B.test
diff --git a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_C.test b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_C.test
index 79f19c54d39..79f19c54d39 100644
--- a/mysql-test/suite/tokudb.add_index/t/falcon_bug_23818_C.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/falcon_bug_23818_C.test
diff --git a/mysql-test/suite/tokudb.add_index/t/hot_create_unique_index.test b/storage/tokudb/mysql-test/tokudb_add_index/t/hot_create_unique_index.test
index 827e3bb0501..827e3bb0501 100644
--- a/mysql-test/suite/tokudb.add_index/t/hot_create_unique_index.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/hot_create_unique_index.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/suite.opt b/storage/tokudb/mysql-test/tokudb_add_index/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.alter_table/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/suite.opt
diff --git a/mysql-test/suite/tokudb.add_index/t/tokudb_bug_1152.test b/storage/tokudb/mysql-test/tokudb_add_index/t/tokudb_bug_1152.test
index 1d50ad3623a..1d50ad3623a 100644
--- a/mysql-test/suite/tokudb.add_index/t/tokudb_bug_1152.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/tokudb_bug_1152.test
diff --git a/mysql-test/suite/tokudb.alter_table/r/4630.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/4630.result
index 7324093ff28..7324093ff28 100644
--- a/mysql-test/suite/tokudb.alter_table/r/4630.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/4630.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/5260.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/5260.result
index deca9d49d98..deca9d49d98 100644
--- a/mysql-test/suite/tokudb.alter_table/r/5260.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/5260.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/ai_aui.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_aui.result
index 74ed5b849c6..74ed5b849c6 100644
--- a/mysql-test/suite/tokudb.alter_table/r/ai_aui.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_aui.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/ai_di.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_di.result
index 5f7bbfe6839..5f7bbfe6839 100644
--- a/mysql-test/suite/tokudb.alter_table/r/ai_di.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_di.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/ai_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
index 38338f7f823..38338f7f823 100644
--- a/mysql-test/suite/tokudb.alter_table/r/ai_part.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/alter_column_default.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
index 2c1390ad2a4..2c1390ad2a4 100644
--- a/mysql-test/suite/tokudb.alter_table/r/alter_column_default.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/auto_inc.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
index fd9a8c3f66a..fd9a8c3f66a 100644
--- a/mysql-test/suite/tokudb.alter_table/r/auto_inc.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/di_dui.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/di_dui.result
index a440fa78b35..a440fa78b35 100644
--- a/mysql-test/suite/tokudb.alter_table/r/di_dui.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/di_dui.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/drop_add_pk_104.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_add_pk_104.result
index d48e6e706bd..d48e6e706bd 100644
--- a/mysql-test/suite/tokudb.alter_table/r/drop_add_pk_104.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_add_pk_104.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/drop_add_pk_part_104.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_add_pk_part_104.result
index 0a66e35f0a7..0a66e35f0a7 100644
--- a/mysql-test/suite/tokudb.alter_table/r/drop_add_pk_part_104.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_add_pk_part_104.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/drop_pk_with_prefix.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_pk_with_prefix.result
index dd3e7d2b03b..dd3e7d2b03b 100644
--- a/mysql-test/suite/tokudb.alter_table/r/drop_pk_with_prefix.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/drop_pk_with_prefix.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/frm_discover.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
index 41c5a6c72d4..41c5a6c72d4 100644
--- a/mysql-test/suite/tokudb.alter_table/r/frm_discover.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/frm_discover_partition.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover_partition.result
index 4e49d3642d2..4e49d3642d2 100644
--- a/mysql-test/suite/tokudb.alter_table/r/frm_discover_partition.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover_partition.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add.result
index 878792f47d9..878792f47d9 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add2.result
index 2449fb52383..2449fb52383 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add3.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add3.result
index 6d658a1ce98..6d658a1ce98 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_add3.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_add3.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_blob_add.result
index fe8545a7873..fe8545a7873 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_blob_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_blob_drop.result
index 8408267c12a..8408267c12a 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_blob_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_drop.result
index df48c3ac7c2..df48c3ac7c2 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_fixed_add.result
index 77f9b976f67..77f9b976f67 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_fixed_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_fixed_drop.result
index 2d800eee010..2d800eee010 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_fixed_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_var_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_var_add.result
index 21be546a111..21be546a111 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_var_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_var_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_all_var_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_var_drop.result
index b43374d16f0..b43374d16f0 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_all_var_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_var_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_and_rename_table.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
index 426834da11b..426834da11b 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_and_rename_table.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_clustering.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_clustering.result
index 12e31fe95c0..12e31fe95c0 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_clustering.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_clustering.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_clustering2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_clustering2.result
index 324382c04a9..324382c04a9 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_clustering2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_clustering2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_diff_num_offset_bytes.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_diff_num_offset_bytes.result
index 14a65749a48..14a65749a48 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_diff_num_offset_bytes.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_diff_num_offset_bytes.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_drop_char0_t6.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_drop_char0_t6.result
index d5ee56199d6..d5ee56199d6 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_drop_char0_t6.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_drop_char0_t6.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_add.result
index 9c7deafff6a..9c7deafff6a 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_add2.result
index a1988af2a19..a1988af2a19 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_add2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_drop.result
index 9d041191251..9d041191251 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedblob_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_add.result
index 73689474e2b..73689474e2b 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_add2.result
index bb2a433dfe1..bb2a433dfe1 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_add2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_drop.result
index 62a80ff2f57..62a80ff2f57 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_indexing_mix.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_indexing_mix.result
index b7f84a69fec..b7f84a69fec 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_indexing_mix.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_indexing_mix.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_null_bits.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_null_bits.result
index 696848da137..696848da137 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_null_bits.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_null_bits.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
index 075ccad6065..075ccad6065 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_part.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_pk.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_pk.result
index 35a6a54da45..35a6a54da45 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_pk.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_pk.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_pk2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_pk2.result
index 4a2531f8654..4a2531f8654 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_pk2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_pk2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_template.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_template.result
index ff486ec720c..ff486ec720c 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_template.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_template.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_tmp_tables.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_tmp_tables.result
index e07192be86f..e07192be86f 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_tmp_tables.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_tmp_tables.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_tmp_tables_56.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_tmp_tables_56.result
index 0ebc7b3d874..0ebc7b3d874 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_tmp_tables_56.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_tmp_tables_56.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_add.result
index 50f2bb4d6d6..50f2bb4d6d6 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_add.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_add2.result
index fda3a0c501e..fda3a0c501e 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_add2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_drop.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_drop.result
index a6e633f9e72..a6e633f9e72 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_varblob_drop.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_varblob_drop.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_with_dels.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_dels.result
index 4d89ee445b0..4d89ee445b0 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_with_dels.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_dels.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_with_lock_sps.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_lock_sps.result
index c1881c78274..c1881c78274 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_with_lock_sps.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_lock_sps.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcad_with_locks.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_locks.result
index 7c49b55176d..7c49b55176d 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcad_with_locks.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_locks.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
index f4fc1b67bb6..f4fc1b67bb6 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr2.result
index 79f62a53ee6..79f62a53ee6 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr3.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
index 6684f04f123..6684f04f123 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr3.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_binary1.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_binary1.result
index a05c1ac694d..a05c1ac694d 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_binary1.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_binary1.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_blob.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_blob.result
index cbc36169e41..cbc36169e41 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_blob.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_blob.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_char1.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_char1.result
index 247fbff8d92..247fbff8d92 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_char1.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_char1.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_enum.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_enum.result
index a615c24c90e..a615c24c90e 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_enum.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_enum.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_text.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_text.result
index b055e4eee84..b055e4eee84 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_text.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_text.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hcr_time.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_time.result
index ef1d7084624..ef1d7084624 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hcr_time.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr_time.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/hot_row_format_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hot_row_format_alter.result
index ab4bce0156e..ab4bce0156e 100644
--- a/mysql-test/suite/tokudb.alter_table/r/hot_row_format_alter.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hot_row_format_alter.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/mod_enum.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
index 21bfb990ba9..21bfb990ba9 100644
--- a/mysql-test/suite/tokudb.alter_table/r/mod_enum.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/null_bytes_add_key.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
index 687c60e4e05..687c60e4e05 100644
--- a/mysql-test/suite/tokudb.alter_table/r/null_bytes_add_key.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/null_bytes_col_rename.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
index 05895bf4b76..05895bf4b76 100644
--- a/mysql-test/suite/tokudb.alter_table/r/null_bytes_col_rename.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/null_bytes_drop_default.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
index ae524926195..ae524926195 100644
--- a/mysql-test/suite/tokudb.alter_table/r/null_bytes_drop_default.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/null_bytes_drop_key.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
index c209c80b4bb..c209c80b4bb 100644
--- a/mysql-test/suite/tokudb.alter_table/r/null_bytes_drop_key.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/other_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
index 7d0403a6a70..7d0403a6a70 100644
--- a/mysql-test/suite/tokudb.alter_table/r/other_alter.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/other_alter2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
index c43a95c64a4..c43a95c64a4 100644
--- a/mysql-test/suite/tokudb.alter_table/r/other_alter2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/rename_column_cold_104.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/rename_column_cold_104.result
index 1f1cbad493d..1f1cbad493d 100644
--- a/mysql-test/suite/tokudb.alter_table/r/rename_column_cold_104.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/rename_column_cold_104.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/rename_column_cold_part_104.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/rename_column_cold_part_104.result
index 82c0dc35025..82c0dc35025 100644
--- a/mysql-test/suite/tokudb.alter_table/r/rename_column_cold_part_104.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/rename_column_cold_part_104.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/row_format_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
index 7ab6b27fd6f..7ab6b27fd6f 100644
--- a/mysql-test/suite/tokudb.alter_table/r/row_format_alter.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/test_field_same_detection.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/test_field_same_detection.result
index 005ac572afd..005ac572afd 100644
--- a/mysql-test/suite/tokudb.alter_table/r/test_field_same_detection.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/test_field_same_detection.result
diff --git a/mysql-test/suite/tokudb.alter_table/r/virtual_columns.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/virtual_columns.result
index eb5dfe2e8cc..eb5dfe2e8cc 100644
--- a/mysql-test/suite/tokudb.alter_table/r/virtual_columns.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/virtual_columns.result
diff --git a/mysql-test/suite/tokudb.alter_table/t/4630.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/4630.test
index cac7959d8da..cac7959d8da 100644
--- a/mysql-test/suite/tokudb.alter_table/t/4630.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/4630.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/5260.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/5260.test
index 4cdf816076a..4cdf816076a 100644
--- a/mysql-test/suite/tokudb.alter_table/t/5260.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/5260.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/ai_aui.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_aui.test
index 3a94e22d2d8..3a94e22d2d8 100644
--- a/mysql-test/suite/tokudb.alter_table/t/ai_aui.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_aui.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/ai_di.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_di.test
index 1d98034a739..1d98034a739 100755
--- a/mysql-test/suite/tokudb.alter_table/t/ai_di.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_di.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/ai_part.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_part.test
index a6b3f6b7b18..a6b3f6b7b18 100644
--- a/mysql-test/suite/tokudb.alter_table/t/ai_part.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/ai_part.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/alter_column_default.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/alter_column_default.test
index 984cb572f9c..984cb572f9c 100644
--- a/mysql-test/suite/tokudb.alter_table/t/alter_column_default.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/alter_column_default.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/auto_inc.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/auto_inc.test
index 5040eed762f..5040eed762f 100644
--- a/mysql-test/suite/tokudb.alter_table/t/auto_inc.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/auto_inc.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/di_dui.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/di_dui.test
index 90839187cb3..90839187cb3 100644
--- a/mysql-test/suite/tokudb.alter_table/t/di_dui.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/di_dui.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/disabled.def b/storage/tokudb/mysql-test/tokudb_alter_table/t/disabled.def
index 3ea96dac116..3ea96dac116 100644
--- a/mysql-test/suite/tokudb.alter_table/t/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/disabled.def
diff --git a/mysql-test/suite/tokudb.alter_table/t/drop_add_pk_104.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_add_pk_104.test
index 1a6bd6b40e2..1a6bd6b40e2 100644
--- a/mysql-test/suite/tokudb.alter_table/t/drop_add_pk_104.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_add_pk_104.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/drop_add_pk_part_104.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_add_pk_part_104.test
index 035c6a0688c..035c6a0688c 100644
--- a/mysql-test/suite/tokudb.alter_table/t/drop_add_pk_part_104.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_add_pk_part_104.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/drop_pk_with_prefix.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_pk_with_prefix.test
index b8563606a2d..b8563606a2d 100644
--- a/mysql-test/suite/tokudb.alter_table/t/drop_pk_with_prefix.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/drop_pk_with_prefix.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/frm_discover.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/frm_discover.test
index 36f97a1f27a..36f97a1f27a 100644
--- a/mysql-test/suite/tokudb.alter_table/t/frm_discover.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/frm_discover.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/frm_discover_partition.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/frm_discover_partition.test
index d40fcfc7096..d40fcfc7096 100644
--- a/mysql-test/suite/tokudb.alter_table/t/frm_discover_partition.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/frm_discover_partition.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add.test
index 575aa34eef5..575aa34eef5 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add2.test
index 005774ab89d..005774ab89d 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add3.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add3.test
index 02eb5301c66..02eb5301c66 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_add3.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add3.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_add.test
index 56afb0ae374..56afb0ae374 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_drop.test
index 8e8023d5755..8e8023d5755 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_drop.test
index bafeb3fe7e2..bafeb3fe7e2 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_add.test
index 0937e71bbca..0937e71bbca 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_drop.test
index 62423f5080d..62423f5080d 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_var_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_add.test
index 4d3f682ff1a..4d3f682ff1a 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_var_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_all_var_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_drop.test
index d979dee9b6c..d979dee9b6c 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_all_var_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_and_rename_table.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_and_rename_table.test
index a3cb07f91c2..a3cb07f91c2 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_and_rename_table.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_and_rename_table.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_clustering.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering.test
index 68c44cad9e0..68c44cad9e0 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_clustering.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_clustering2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering2.test
index f7d2df39b23..f7d2df39b23 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_clustering2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_clustering2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_diff_num_offset_bytes.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_diff_num_offset_bytes.test
index 572fa3d85f0..572fa3d85f0 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_diff_num_offset_bytes.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_diff_num_offset_bytes.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_drop_char0_t6.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_drop_char0_t6.test
index 7e130863147..7e130863147 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_drop_char0_t6.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_drop_char0_t6.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add.test
index 01280424507..01280424507 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add2.test
index b27b9332895..b27b9332895 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_add2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_drop.test
index 7f9e11e2dd1..7f9e11e2dd1 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedblob_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add.test
index 9114d4126f1..9114d4126f1 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add2.test
index 4e35586ed40..4e35586ed40 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_add2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_drop.test
index 58e6b8aaf3d..58e6b8aaf3d 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_indexing_mix.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_indexing_mix.test
index 7c68ca2ccb8..7c68ca2ccb8 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_indexing_mix.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_indexing_mix.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_null_bits.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_null_bits.test
index 1297be433a1..1297be433a1 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_null_bits.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_null_bits.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_part.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_part.test
index 4eaeb623f66..4eaeb623f66 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_part.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_part.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_pk.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk.test
index 800220fd913..800220fd913 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_pk.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_pk2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk2.test
index d157d84a931..d157d84a931 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_pk2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_pk2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_template.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_template.test
index 73229b1c4e9..73229b1c4e9 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_template.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_template.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables.test
index a1c967acbeb..a1c967acbeb 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables_56.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables_56.test
index ac50a658013..ac50a658013 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables_56.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_tmp_tables_56.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add.test
index f271a33be0e..f271a33be0e 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add2.test
index 42b645c4923..42b645c4923 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_add2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_drop.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_drop.test
index fcd8de8ef6d..fcd8de8ef6d 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_varblob_drop.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_varblob_drop.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_with_dels.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_dels.test
index f498bd6fa7f..f498bd6fa7f 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_with_dels.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_dels.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_with_lock_sps.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_lock_sps.test
index fd75304ad39..fd75304ad39 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_with_lock_sps.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_lock_sps.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcad_with_locks.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_locks.test
index c9da51dfbb8..c9da51dfbb8 100755
--- a/mysql-test/suite/tokudb.alter_table/t/hcad_with_locks.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_with_locks.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr.test
index 7e9ba70a89b..7e9ba70a89b 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr2.test
index 3f4b819e922..3f4b819e922 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr3.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr3.test
index 5f9c771f785..5f9c771f785 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr3.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr3.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_binary1.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_binary1.test
index 50bf0473c42..50bf0473c42 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_binary1.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_binary1.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_blob.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_blob.test
index ca70221c208..ca70221c208 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_blob.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_blob.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_char1.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_char1.test
index bb9b2fb527a..bb9b2fb527a 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_char1.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_char1.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_enum.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_enum.test
index 2b471a43096..2b471a43096 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_enum.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_enum.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_text.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_text.test
index ca4a3a49434..ca4a3a49434 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_text.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_text.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hcr_time.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_time.test
index d43de68b5af..d43de68b5af 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hcr_time.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hcr_time.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/hot_row_format_alter.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/hot_row_format_alter.test
index e75023b3383..e75023b3383 100644
--- a/mysql-test/suite/tokudb.alter_table/t/hot_row_format_alter.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/hot_row_format_alter.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/mod_enum.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
index 4efa3afd96e..4efa3afd96e 100644
--- a/mysql-test/suite/tokudb.alter_table/t/mod_enum.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/null_bytes_add_key.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
index 63608ffaa2b..63608ffaa2b 100644
--- a/mysql-test/suite/tokudb.alter_table/t/null_bytes_add_key.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/null_bytes_col_rename.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
index 15f916c945e..15f916c945e 100644
--- a/mysql-test/suite/tokudb.alter_table/t/null_bytes_col_rename.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/null_bytes_drop_default.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
index 009af23b216..009af23b216 100644
--- a/mysql-test/suite/tokudb.alter_table/t/null_bytes_drop_default.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/null_bytes_drop_key.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
index a9eea935012..a9eea935012 100644
--- a/mysql-test/suite/tokudb.alter_table/t/null_bytes_drop_key.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/other_alter.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter.test
index 98ff6cd3e37..98ff6cd3e37 100644
--- a/mysql-test/suite/tokudb.alter_table/t/other_alter.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/other_alter2.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter2.test
index 4d0ea286789..4d0ea286789 100644
--- a/mysql-test/suite/tokudb.alter_table/t/other_alter2.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/other_alter2.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/rename_column_cold_104.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/rename_column_cold_104.test
index 6cc014cf73b..6cc014cf73b 100644
--- a/mysql-test/suite/tokudb.alter_table/t/rename_column_cold_104.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/rename_column_cold_104.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/rename_column_cold_part_104.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/rename_column_cold_part_104.test
index e1e5f2460d5..e1e5f2460d5 100644
--- a/mysql-test/suite/tokudb.alter_table/t/rename_column_cold_part_104.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/rename_column_cold_part_104.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/row_format_alter.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/row_format_alter.test
index 66d19a812d6..66d19a812d6 100644
--- a/mysql-test/suite/tokudb.alter_table/t/row_format_alter.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/row_format_alter.test
diff --git a/mysql-test/suite/tokudb.bugs/t/suite.opt b/storage/tokudb/mysql-test/tokudb_alter_table/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.bugs/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/suite.opt
diff --git a/mysql-test/suite/tokudb.alter_table/t/test_field_same_detection.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/test_field_same_detection.test
index a6813a5c69a..a6813a5c69a 100644
--- a/mysql-test/suite/tokudb.alter_table/t/test_field_same_detection.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/test_field_same_detection.test
diff --git a/mysql-test/suite/tokudb.alter_table/t/virtual_columns.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/virtual_columns.test
index 34ecdca36e2..34ecdca36e2 100755
--- a/mysql-test/suite/tokudb.alter_table/t/virtual_columns.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/virtual_columns.test
diff --git a/mysql-test/suite/tokudb.backup/r/tokudb_backup_exclude.result b/storage/tokudb/mysql-test/tokudb_backup/r/tokudb_backup_exclude.result
index 0bec62e54f6..0bec62e54f6 100644
--- a/mysql-test/suite/tokudb.backup/r/tokudb_backup_exclude.result
+++ b/storage/tokudb/mysql-test/tokudb_backup/r/tokudb_backup_exclude.result
diff --git a/mysql-test/suite/tokudb.backup/r/tokudb_backup_set_last_error.result b/storage/tokudb/mysql-test/tokudb_backup/r/tokudb_backup_set_last_error.result
index e1baf8418ad..e1baf8418ad 100644
--- a/mysql-test/suite/tokudb.backup/r/tokudb_backup_set_last_error.result
+++ b/storage/tokudb/mysql-test/tokudb_backup/r/tokudb_backup_set_last_error.result
diff --git a/mysql-test/suite/tokudb.backup/t/suite.opt b/storage/tokudb/mysql-test/tokudb_backup/t/suite.opt
index e52bd6327e0..e52bd6327e0 100644
--- a/mysql-test/suite/tokudb.backup/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_backup/t/suite.opt
diff --git a/mysql-test/suite/tokudb.backup/t/tokudb_backup_exclude.test b/storage/tokudb/mysql-test/tokudb_backup/t/tokudb_backup_exclude.test
index a0ff5152f66..a0ff5152f66 100644
--- a/mysql-test/suite/tokudb.backup/t/tokudb_backup_exclude.test
+++ b/storage/tokudb/mysql-test/tokudb_backup/t/tokudb_backup_exclude.test
diff --git a/mysql-test/suite/tokudb.backup/t/tokudb_backup_set_last_error.test b/storage/tokudb/mysql-test/tokudb_backup/t/tokudb_backup_set_last_error.test
index 18fc8cc5efb..18fc8cc5efb 100644
--- a/mysql-test/suite/tokudb.backup/t/tokudb_backup_set_last_error.test
+++ b/storage/tokudb/mysql-test/tokudb_backup/t/tokudb_backup_set_last_error.test
diff --git a/mysql-test/suite/tokudb.bugs/r/1648.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1648.result
index 3f75c31be40..3f75c31be40 100755
--- a/mysql-test/suite/tokudb.bugs/r/1648.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1648.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1684.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1684.result
index e60d46d47a5..e60d46d47a5 100755
--- a/mysql-test/suite/tokudb.bugs/r/1684.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1684.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1711.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1711.result
index f2586ca6312..f2586ca6312 100644
--- a/mysql-test/suite/tokudb.bugs/r/1711.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1711.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1795.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1795.result
index 132d47d9a2f..132d47d9a2f 100755
--- a/mysql-test/suite/tokudb.bugs/r/1795.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1795.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1833.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1833.result
index 2dae2efe763..2dae2efe763 100755
--- a/mysql-test/suite/tokudb.bugs/r/1833.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1833.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1853.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1853.result
index 7304a399ab4..7304a399ab4 100644
--- a/mysql-test/suite/tokudb.bugs/r/1853.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1853.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1872.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1872.result
index f626d47e73b..f626d47e73b 100755
--- a/mysql-test/suite/tokudb.bugs/r/1872.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1872.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1883.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1883.result
index c4945917552..c4945917552 100755
--- a/mysql-test/suite/tokudb.bugs/r/1883.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1883.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1913.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1913.result
index 9a9be87d990..9a9be87d990 100644
--- a/mysql-test/suite/tokudb.bugs/r/1913.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1913.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1938.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1938.result
index d67b8022ffd..d67b8022ffd 100755
--- a/mysql-test/suite/tokudb.bugs/r/1938.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1938.result
diff --git a/mysql-test/suite/tokudb.bugs/r/1949.result b/storage/tokudb/mysql-test/tokudb_bugs/r/1949.result
index 0edb2dd75e1..0edb2dd75e1 100755
--- a/mysql-test/suite/tokudb.bugs/r/1949.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/1949.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2043.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2043.result
index 4c2ecc1f414..4c2ecc1f414 100755
--- a/mysql-test/suite/tokudb.bugs/r/2043.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2043.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2219.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2219.result
index dc8e4a38b81..dc8e4a38b81 100755
--- a/mysql-test/suite/tokudb.bugs/r/2219.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2219.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2262.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2262.result
index 4c96e912f0e..4c96e912f0e 100755
--- a/mysql-test/suite/tokudb.bugs/r/2262.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2262.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2383.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2383.result
index 4497ec5f443..4497ec5f443 100644
--- a/mysql-test/suite/tokudb.bugs/r/2383.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2383.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2458.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2458.result
index 32b5e2ddce1..32b5e2ddce1 100644
--- a/mysql-test/suite/tokudb.bugs/r/2458.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2458.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2494-read-committed.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2494-read-committed.result
index 884767dbe94..884767dbe94 100755
--- a/mysql-test/suite/tokudb.bugs/r/2494-read-committed.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2494-read-committed.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2548.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2548.result
index 2870153ce9e..2870153ce9e 100644
--- a/mysql-test/suite/tokudb.bugs/r/2548.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2548.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2641.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2641.result
index bf4e7aec2d9..bf4e7aec2d9 100755
--- a/mysql-test/suite/tokudb.bugs/r/2641.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2641.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2952.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
index 81800c9488e..81800c9488e 100755
--- a/mysql-test/suite/tokudb.bugs/r/2952.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2970.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2970.result
index 83ba8821f27..83ba8821f27 100644
--- a/mysql-test/suite/tokudb.bugs/r/2970.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2970.result
diff --git a/mysql-test/suite/tokudb.bugs/r/2970i.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2970i.result
index 6002dc9474c..6002dc9474c 100644
--- a/mysql-test/suite/tokudb.bugs/r/2970i.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2970i.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3014.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3014.result
index 477a32e2d00..477a32e2d00 100755
--- a/mysql-test/suite/tokudb.bugs/r/3014.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3014.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3015.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3015.result
index 3efa2ad3502..3efa2ad3502 100755
--- a/mysql-test/suite/tokudb.bugs/r/3015.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3015.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3083.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3083.result
index bc182326c63..bc182326c63 100755
--- a/mysql-test/suite/tokudb.bugs/r/3083.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3083.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3441.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3441.result
index f43739a72fa..f43739a72fa 100644
--- a/mysql-test/suite/tokudb.bugs/r/3441.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3441.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3478.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3478.result
index cddc7c0e72d..cddc7c0e72d 100644
--- a/mysql-test/suite/tokudb.bugs/r/3478.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3478.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3486.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3486.result
index 19363055164..19363055164 100644
--- a/mysql-test/suite/tokudb.bugs/r/3486.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3486.result
diff --git a/mysql-test/suite/tokudb.bugs/r/3518.result b/storage/tokudb/mysql-test/tokudb_bugs/r/3518.result
index 0d81a2f2a9d..0d81a2f2a9d 100644
--- a/mysql-test/suite/tokudb.bugs/r/3518.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/3518.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4175.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4175.result
index 979bfdcebd0..979bfdcebd0 100644
--- a/mysql-test/suite/tokudb.bugs/r/4175.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4175.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4260.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4260.result
index fdcd7a94f21..fdcd7a94f21 100644
--- a/mysql-test/suite/tokudb.bugs/r/4260.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4260.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4472.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4472.result
index 944368a2b8e..944368a2b8e 100644
--- a/mysql-test/suite/tokudb.bugs/r/4472.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4472.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4618.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4618.result
index 8db5211cfd3..8db5211cfd3 100644
--- a/mysql-test/suite/tokudb.bugs/r/4618.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4618.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4633.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4633.result
index 16945719691..16945719691 100644
--- a/mysql-test/suite/tokudb.bugs/r/4633.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4633.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4648.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4648.result
index 1e1f1d1158b..1e1f1d1158b 100644
--- a/mysql-test/suite/tokudb.bugs/r/4648.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4648.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4656.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4656.result
index a30d3c2afb5..a30d3c2afb5 100644
--- a/mysql-test/suite/tokudb.bugs/r/4656.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4656.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4656_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4656_2.result
index 83a9f355d8a..83a9f355d8a 100644
--- a/mysql-test/suite/tokudb.bugs/r/4656_2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4656_2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/4675.result b/storage/tokudb/mysql-test/tokudb_bugs/r/4675.result
index 73c50bf2a3e..73c50bf2a3e 100644
--- a/mysql-test/suite/tokudb.bugs/r/4675.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/4675.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5003.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5003.result
index 4d6b7d9261d..4d6b7d9261d 100644
--- a/mysql-test/suite/tokudb.bugs/r/5003.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5003.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5089.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
index 3cb39c594a1..3cb39c594a1 100644
--- a/mysql-test/suite/tokudb.bugs/r/5089.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5469.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5469.result
index 3e297b042be..3e297b042be 100644
--- a/mysql-test/suite/tokudb.bugs/r/5469.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5469.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5554.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5554.result
index d24ccfc4b95..d24ccfc4b95 100644
--- a/mysql-test/suite/tokudb.bugs/r/5554.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5554.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5585.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5585.result
index 608afa00370..608afa00370 100644
--- a/mysql-test/suite/tokudb.bugs/r/5585.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5585.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5695.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5695.result
index 9ae4b1b7986..9ae4b1b7986 100644
--- a/mysql-test/suite/tokudb.bugs/r/5695.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5695.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5733_innodb.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result
index 10cdb4767f6..10cdb4767f6 100644
--- a/mysql-test/suite/tokudb.bugs/r/5733_innodb.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5733_tokudb.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result
index 1db2c5746e2..1db2c5746e2 100644
--- a/mysql-test/suite/tokudb.bugs/r/5733_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5951.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5951.result
index b945d874b25..b945d874b25 100644
--- a/mysql-test/suite/tokudb.bugs/r/5951.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5951.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5974-2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5974-2.result
index ee6970fce7d..ee6970fce7d 100644
--- a/mysql-test/suite/tokudb.bugs/r/5974-2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5974-2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/5974.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5974.result
index c22e565bcb4..c22e565bcb4 100644
--- a/mysql-test/suite/tokudb.bugs/r/5974.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5974.result
diff --git a/mysql-test/suite/tokudb.bugs/r/6053.result b/storage/tokudb/mysql-test/tokudb_bugs/r/6053.result
index a9fab492246..a9fab492246 100644
--- a/mysql-test/suite/tokudb.bugs/r/6053.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/6053.result
diff --git a/mysql-test/suite/tokudb.bugs/r/6684.result b/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result
index b2d393d4469..b2d393d4469 100644
--- a/mysql-test/suite/tokudb.bugs/r/6684.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result
diff --git a/mysql-test/suite/tokudb.bugs/r/889.result b/storage/tokudb/mysql-test/tokudb_bugs/r/889.result
index 621f78e4fb4..621f78e4fb4 100644
--- a/mysql-test/suite/tokudb.bugs/r/889.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/889.result
diff --git a/mysql-test/suite/tokudb.bugs/r/895.result b/storage/tokudb/mysql-test/tokudb_bugs/r/895.result
index 59bd36c15be..59bd36c15be 100644
--- a/mysql-test/suite/tokudb.bugs/r/895.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/895.result
diff --git a/mysql-test/suite/tokudb.bugs/r/94.result b/storage/tokudb/mysql-test/tokudb_bugs/r/94.result
index 4b7649c67ec..4b7649c67ec 100644
--- a/mysql-test/suite/tokudb.bugs/r/94.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/94.result
diff --git a/mysql-test/suite/tokudb.bugs/r/alter_external_lock_assert.result b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_external_lock_assert.result
index 7c06d4354cd..7c06d4354cd 100644
--- a/mysql-test/suite/tokudb.bugs/r/alter_external_lock_assert.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_external_lock_assert.result
diff --git a/mysql-test/suite/tokudb.bugs/r/alter_part_tokudb_bug_155.result b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_part_tokudb_bug_155.result
index 02a9cf8ab3a..02a9cf8ab3a 100644
--- a/mysql-test/suite/tokudb.bugs/r/alter_part_tokudb_bug_155.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_part_tokudb_bug_155.result
diff --git a/mysql-test/suite/tokudb.bugs/r/alter_table_copy_table.result b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result
index e8765ec7ab9..e8765ec7ab9 100644
--- a/mysql-test/suite/tokudb.bugs/r/alter_table_copy_table.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bulk_fetch.result b/storage/tokudb/mysql-test/tokudb_bugs/r/bulk_fetch.result
index 4f2eaf307ee..4f2eaf307ee 100644
--- a/mysql-test/suite/tokudb.bugs/r/bulk_fetch.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/bulk_fetch.result
diff --git a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
index f7482301e62..f7482301e62 100644
--- a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
diff --git a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result
index 4f3580dccd3..4f3580dccd3 100644
--- a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock_2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock_3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result
index 21a27a5b1cd..21a27a5b1cd 100644
--- a/mysql-test/suite/tokudb.bugs/r/checkpoint_lock_3.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result
diff --git a/mysql-test/suite/tokudb.bugs/r/commit_index_end_1.result b/storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_1.result
index 6acce580af0..6acce580af0 100644
--- a/mysql-test/suite/tokudb.bugs/r/commit_index_end_1.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_1.result
diff --git a/mysql-test/suite/tokudb.bugs/r/commit_index_end_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_2.result
index 6ac385b4eb1..6ac385b4eb1 100644
--- a/mysql-test/suite/tokudb.bugs/r/commit_index_end_2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/commit_index_end_2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db397_delete_trigger.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result
index da82fa445e8..da82fa445e8 100644
--- a/mysql-test/suite/tokudb.bugs/r/db397_delete_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db397_insert_trigger.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_insert_trigger.result
index 41765a6fcd3..41765a6fcd3 100644
--- a/mysql-test/suite/tokudb.bugs/r/db397_insert_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_insert_trigger.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db397_update_trigger.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_update_trigger.result
index c197430ad25..c197430ad25 100644
--- a/mysql-test/suite/tokudb.bugs/r/db397_update_trigger.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_update_trigger.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db739_insert.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_insert.result
index c1ea1c2f484..c1ea1c2f484 100644
--- a/mysql-test/suite/tokudb.bugs/r/db739_insert.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_insert.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db739_replace.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_replace.result
index 2bf141add9a..2bf141add9a 100644
--- a/mysql-test/suite/tokudb.bugs/r/db739_replace.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_replace.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db739_upsert.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_upsert.result
index 44281b674f8..44281b674f8 100644
--- a/mysql-test/suite/tokudb.bugs/r/db739_upsert.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db739_upsert.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db743.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db743.result
index 2b2fc2892d7..2b2fc2892d7 100644
--- a/mysql-test/suite/tokudb.bugs/r/db743.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db743.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result
index 70bc86e1abc..70bc86e1abc 100644
--- a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result
index b6d9fd7da85..b6d9fd7da85 100644
--- a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1_pick.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result
index caaa963c325..caaa963c325 100644
--- a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1_pick.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result
index 6d345d98c95..6d345d98c95 100644
--- a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2_pick.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2_pick.result
index 06639c311cf..06639c311cf 100644
--- a/mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2_pick.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2_pick.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db757_part_alter_analyze.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result
index 4b82cb06026..4b82cb06026 100644
--- a/mysql-test/suite/tokudb.bugs/r/db757_part_alter_analyze.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db762.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db762.result
index 159957dba3e..159957dba3e 100644
--- a/mysql-test/suite/tokudb.bugs/r/db762.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db762.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db766.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db766.result
index e109b0a7f15..e109b0a7f15 100644
--- a/mysql-test/suite/tokudb.bugs/r/db766.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db766.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db768.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db768.result
index f302114b45c..f302114b45c 100644
--- a/mysql-test/suite/tokudb.bugs/r/db768.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db768.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db771.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db771.result
index 3fc012a732f..3fc012a732f 100644
--- a/mysql-test/suite/tokudb.bugs/r/db771.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db771.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db788-optimize-index-name.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db788-optimize-index-name.result
index 019a8299f3c..019a8299f3c 100644
--- a/mysql-test/suite/tokudb.bugs/r/db788-optimize-index-name.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db788-optimize-index-name.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db801.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db801.result
index 800db69ba39..800db69ba39 100644
--- a/mysql-test/suite/tokudb.bugs/r/db801.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db801.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db805.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db805.result
index 1bc0372f1b8..1bc0372f1b8 100644
--- a/mysql-test/suite/tokudb.bugs/r/db805.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db805.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db806.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db806.result
index ae87dbab281..ae87dbab281 100644
--- a/mysql-test/suite/tokudb.bugs/r/db806.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db806.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db811.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db811.result
index 1d26f43c9dd..1d26f43c9dd 100644
--- a/mysql-test/suite/tokudb.bugs/r/db811.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db811.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db811s.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db811s.result
index 0a50e63e037..0a50e63e037 100644
--- a/mysql-test/suite/tokudb.bugs/r/db811s.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db811s.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db817.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db817.result
index d69f0dabcb3..d69f0dabcb3 100644
--- a/mysql-test/suite/tokudb.bugs/r/db817.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db817.result
diff --git a/mysql-test/suite/tokudb.bugs/r/db823.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db823.result
index d94da5c0673..d94da5c0673 100644
--- a/mysql-test/suite/tokudb.bugs/r/db823.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db823.result
diff --git a/mysql-test/suite/tokudb.bugs/r/dict_leak_3518.result b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
index ae80daae14b..ae80daae14b 100644
--- a/mysql-test/suite/tokudb.bugs/r/dict_leak_3518.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
diff --git a/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result b/storage/tokudb/mysql-test/tokudb_bugs/r/expand_tinytext_text.result
index dd517562a1b..dd517562a1b 100644
--- a/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/expand_tinytext_text.result
diff --git a/mysql-test/suite/tokudb.bugs/r/fileops-2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-2.result
index 96d71b1638c..96d71b1638c 100755
--- a/mysql-test/suite/tokudb.bugs/r/fileops-2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/fileops-3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-3.result
index 60e1d29a3a2..60e1d29a3a2 100755
--- a/mysql-test/suite/tokudb.bugs/r/fileops-3.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-3.result
diff --git a/mysql-test/suite/tokudb.bugs/r/fileops-4.result b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-4.result
index 98be6d9d297..98be6d9d297 100755
--- a/mysql-test/suite/tokudb.bugs/r/fileops-4.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops-4.result
diff --git a/mysql-test/suite/tokudb.bugs/r/fileops.result b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops.result
index 967f0d6a4e2..967f0d6a4e2 100755
--- a/mysql-test/suite/tokudb.bugs/r/fileops.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/fileops.result
diff --git a/mysql-test/suite/tokudb.bugs/r/frm_store.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
index 65503b908ca..65503b908ca 100644
--- a/mysql-test/suite/tokudb.bugs/r/frm_store.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
diff --git a/mysql-test/suite/tokudb.bugs/r/frm_store2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
index b202da70fcf..b202da70fcf 100644
--- a/mysql-test/suite/tokudb.bugs/r/frm_store2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/frm_store3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
index 2b098d68705..2b098d68705 100644
--- a/mysql-test/suite/tokudb.bugs/r/frm_store3.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
diff --git a/mysql-test/suite/tokudb.bugs/r/ft-index-40.result b/storage/tokudb/mysql-test/tokudb_bugs/r/ft-index-40.result
index d4b2e44af3b..d4b2e44af3b 100644
--- a/mysql-test/suite/tokudb.bugs/r/ft-index-40.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/ft-index-40.result
diff --git a/mysql-test/suite/tokudb.bugs/r/index_read.result b/storage/tokudb/mysql-test/tokudb_bugs/r/index_read.result
index f803da0b8fc..f803da0b8fc 100644
--- a/mysql-test/suite/tokudb.bugs/r/index_read.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/index_read.result
diff --git a/mysql-test/suite/tokudb.bugs/r/leak172.result b/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result
index 8dcbbf8ef84..8dcbbf8ef84 100644
--- a/mysql-test/suite/tokudb.bugs/r/leak172.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result
diff --git a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_empty.result b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_empty.result
index 325aef46afe..325aef46afe 100644
--- a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_empty.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_empty.result
diff --git a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_left.result b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_left.result
index b94dbbbd1b5..b94dbbbd1b5 100644
--- a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_left.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_left.result
diff --git a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_middle.result b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_middle.result
index 763cfc88812..763cfc88812 100644
--- a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_middle.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_middle.result
diff --git a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_right.result b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_right.result
index b820a4f0806..b820a4f0806 100644
--- a/mysql-test/suite/tokudb.bugs/r/lock_uniq_key_right.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/lock_uniq_key_right.result
diff --git a/mysql-test/suite/tokudb.bugs/r/mdev4533.result b/storage/tokudb/mysql-test/tokudb_bugs/r/mdev4533.result
index 8a53e820d7a..8a53e820d7a 100644
--- a/mysql-test/suite/tokudb.bugs/r/mdev4533.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/mdev4533.result
diff --git a/mysql-test/suite/tokudb.bugs/r/mdev5932.result b/storage/tokudb/mysql-test/tokudb_bugs/r/mdev5932.result
index f179ee36f95..f179ee36f95 100644
--- a/mysql-test/suite/tokudb.bugs/r/mdev5932.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/mdev5932.result
diff --git a/mysql-test/suite/tokudb.bugs/r/optimize_temp_table_tokudb.result b/storage/tokudb/mysql-test/tokudb_bugs/r/optimize_temp_table_tokudb.result
index f3ac15b220d..f3ac15b220d 100644
--- a/mysql-test/suite/tokudb.bugs/r/optimize_temp_table_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/optimize_temp_table_tokudb.result
diff --git a/mysql-test/suite/tokudb.bugs/r/rpl_mixed_replace_into.result b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_mixed_replace_into.result
index b1482aa0144..b1482aa0144 100644
--- a/mysql-test/suite/tokudb.bugs/r/rpl_mixed_replace_into.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_mixed_replace_into.result
diff --git a/mysql-test/suite/tokudb.bugs/r/rpl_row_replace_into.result b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_row_replace_into.result
index b1482aa0144..b1482aa0144 100644
--- a/mysql-test/suite/tokudb.bugs/r/rpl_row_replace_into.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_row_replace_into.result
diff --git a/mysql-test/suite/tokudb.bugs/r/rpl_stmt_replace_into.result b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_stmt_replace_into.result
index 0f944801ebf..0f944801ebf 100644
--- a/mysql-test/suite/tokudb.bugs/r/rpl_stmt_replace_into.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/rpl_stmt_replace_into.result
diff --git a/mysql-test/suite/tokudb.bugs/r/simple_icp.result b/storage/tokudb/mysql-test/tokudb_bugs/r/simple_icp.result
index 2975d7d3116..2975d7d3116 100644
--- a/mysql-test/suite/tokudb.bugs/r/simple_icp.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/simple_icp.result
diff --git a/mysql-test/suite/tokudb.bugs/r/subselect_index_next_same_bug_157.result b/storage/tokudb/mysql-test/tokudb_bugs/r/subselect_index_next_same_bug_157.result
index b02d8fb831e..b02d8fb831e 100644
--- a/mysql-test/suite/tokudb.bugs/r/subselect_index_next_same_bug_157.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/subselect_index_next_same_bug_157.result
diff --git a/mysql-test/suite/tokudb.bugs/r/tokudb718.result b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result
index 0cf75d40847..0cf75d40847 100644
--- a/mysql-test/suite/tokudb.bugs/r/tokudb718.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result
diff --git a/mysql-test/suite/tokudb.bugs/r/tokudb_drop_part_table_668.result b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_part_table_668.result
index 92fb1f762f4..92fb1f762f4 100644
--- a/mysql-test/suite/tokudb.bugs/r/tokudb_drop_part_table_668.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_part_table_668.result
diff --git a/mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_simple_table_668.result
index 53f8b9a6319..53f8b9a6319 100644
--- a/mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb_drop_simple_table_668.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-1.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-1.result
index 4a6268f5365..4a6268f5365 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-1.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-1.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-2.result
index f908dc8e3e0..f908dc8e3e0 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-2.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-3.result
index d84dc9dd2a7..d84dc9dd2a7 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-3.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-3.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-4.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-4.result
index bcea577a59f..bcea577a59f 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-4.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-4.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-5.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-5.result
index 0a8e78ede4f..0a8e78ede4f 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-5.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-5.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa-6.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result
index b052f807cd1..b052f807cd1 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa-6.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa-6.result
diff --git a/mysql-test/suite/tokudb.bugs/r/xa.result b/storage/tokudb/mysql-test/tokudb_bugs/r/xa.result
index 457c5543f8c..457c5543f8c 100644
--- a/mysql-test/suite/tokudb.bugs/r/xa.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/xa.result
diff --git a/mysql-test/suite/tokudb.bugs/t/1648.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1648.test
index b89daa191eb..b89daa191eb 100644
--- a/mysql-test/suite/tokudb.bugs/t/1648.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1648.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1684.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1684.test
index a024a698312..a024a698312 100755
--- a/mysql-test/suite/tokudb.bugs/t/1684.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1684.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1711.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1711.test
index 0d677388868..0d677388868 100755
--- a/mysql-test/suite/tokudb.bugs/t/1711.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1711.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1795.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1795.test
index 36d0bbb591e..36d0bbb591e 100644
--- a/mysql-test/suite/tokudb.bugs/t/1795.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1795.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1833.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1833.test
index 66229c75188..66229c75188 100644
--- a/mysql-test/suite/tokudb.bugs/t/1833.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1833.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1853.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1853.test
index 8f5255c2e01..8f5255c2e01 100644
--- a/mysql-test/suite/tokudb.bugs/t/1853.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1853.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1872.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1872.test
index 72d9b0a70c2..72d9b0a70c2 100644
--- a/mysql-test/suite/tokudb.bugs/t/1872.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1872.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1883.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1883.test
index 3827d487861..3827d487861 100755
--- a/mysql-test/suite/tokudb.bugs/t/1883.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1883.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1913.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1913.test
index 18c8eb52ff9..18c8eb52ff9 100755
--- a/mysql-test/suite/tokudb.bugs/t/1913.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1913.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1938.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1938.test
index 7d888bbaf34..7d888bbaf34 100755
--- a/mysql-test/suite/tokudb.bugs/t/1938.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1938.test
diff --git a/mysql-test/suite/tokudb.bugs/t/1949.test b/storage/tokudb/mysql-test/tokudb_bugs/t/1949.test
index 82deff17bc9..82deff17bc9 100755
--- a/mysql-test/suite/tokudb.bugs/t/1949.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/1949.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2043.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2043.test
index 0a6e8b8e1e1..0a6e8b8e1e1 100755
--- a/mysql-test/suite/tokudb.bugs/t/2043.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2043.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2219.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2219.test
index c61f4eca191..c61f4eca191 100755
--- a/mysql-test/suite/tokudb.bugs/t/2219.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2219.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2262.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2262.test
index c18d4ee4c19..c18d4ee4c19 100755
--- a/mysql-test/suite/tokudb.bugs/t/2262.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2262.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2383.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2383.test
index fa10de2f5ae..fa10de2f5ae 100644
--- a/mysql-test/suite/tokudb.bugs/t/2383.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2383.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2458.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2458.test
index e6fc277e546..e6fc277e546 100755
--- a/mysql-test/suite/tokudb.bugs/t/2458.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2458.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2494-read-committed.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2494-read-committed.test
index 88d1c787f1d..88d1c787f1d 100755
--- a/mysql-test/suite/tokudb.bugs/t/2494-read-committed.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2494-read-committed.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2548.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2548.test
index a6c012de0eb..a6c012de0eb 100755
--- a/mysql-test/suite/tokudb.bugs/t/2548.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2548.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2641.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2641.test
index a0f203c8149..a0f203c8149 100755
--- a/mysql-test/suite/tokudb.bugs/t/2641.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2641.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2952.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2952.test
index 255dd73f2d3..255dd73f2d3 100755
--- a/mysql-test/suite/tokudb.bugs/t/2952.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2952.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2970.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2970.test
index e6b544407e8..e6b544407e8 100644
--- a/mysql-test/suite/tokudb.bugs/t/2970.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2970.test
diff --git a/mysql-test/suite/tokudb.bugs/t/2970i.test b/storage/tokudb/mysql-test/tokudb_bugs/t/2970i.test
index 36796c16a3f..36796c16a3f 100644
--- a/mysql-test/suite/tokudb.bugs/t/2970i.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/2970i.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3014.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3014.test
index e6f12eca825..e6f12eca825 100755
--- a/mysql-test/suite/tokudb.bugs/t/3014.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3014.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3015.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3015.test
index 874d18c339f..874d18c339f 100755
--- a/mysql-test/suite/tokudb.bugs/t/3015.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3015.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3083.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3083.test
index 883788f33fe..883788f33fe 100755
--- a/mysql-test/suite/tokudb.bugs/t/3083.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3083.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3441.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3441.test
index 74a2667bf0e..74a2667bf0e 100644
--- a/mysql-test/suite/tokudb.bugs/t/3441.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3441.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3478.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3478.test
index d3e7cf07313..d3e7cf07313 100644
--- a/mysql-test/suite/tokudb.bugs/t/3478.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3478.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3486.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3486.test
index f6da457663c..f6da457663c 100644
--- a/mysql-test/suite/tokudb.bugs/t/3486.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3486.test
diff --git a/mysql-test/suite/tokudb.bugs/t/3518.test b/storage/tokudb/mysql-test/tokudb_bugs/t/3518.test
index 18c0aa79f14..18c0aa79f14 100644
--- a/mysql-test/suite/tokudb.bugs/t/3518.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/3518.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4175.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4175.test
index b76ee506786..b76ee506786 100644
--- a/mysql-test/suite/tokudb.bugs/t/4175.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4175.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4260.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4260.test
index 7e9d91f9868..7e9d91f9868 100644
--- a/mysql-test/suite/tokudb.bugs/t/4260.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4260.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4472.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4472.test
index 9eef8934732..9eef8934732 100755
--- a/mysql-test/suite/tokudb.bugs/t/4472.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4472.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4618.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4618.test
index b00822c2949..b00822c2949 100644
--- a/mysql-test/suite/tokudb.bugs/t/4618.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4618.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4633.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4633.test
index adb14e5b6f2..adb14e5b6f2 100644
--- a/mysql-test/suite/tokudb.bugs/t/4633.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4633.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4648.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4648.test
index a1670455fbc..a1670455fbc 100644
--- a/mysql-test/suite/tokudb.bugs/t/4648.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4648.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4656.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4656.test
index 98b3a8fb204..98b3a8fb204 100644
--- a/mysql-test/suite/tokudb.bugs/t/4656.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4656.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4656_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4656_2.test
index a65be6aec15..a65be6aec15 100644
--- a/mysql-test/suite/tokudb.bugs/t/4656_2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4656_2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/4675.test b/storage/tokudb/mysql-test/tokudb_bugs/t/4675.test
index 551a2eb93b1..551a2eb93b1 100644
--- a/mysql-test/suite/tokudb.bugs/t/4675.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/4675.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5003.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5003.test
index 26ba071eda3..26ba071eda3 100644
--- a/mysql-test/suite/tokudb.bugs/t/5003.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5003.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5089.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5089.test
index f3265d3ff39..f3265d3ff39 100644
--- a/mysql-test/suite/tokudb.bugs/t/5089.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5089.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5469.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5469.test
index d4d82345bc0..d4d82345bc0 100644
--- a/mysql-test/suite/tokudb.bugs/t/5469.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5469.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5554.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5554.test
index 1ff546e28f2..1ff546e28f2 100644
--- a/mysql-test/suite/tokudb.bugs/t/5554.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5554.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5585-master.opt b/storage/tokudb/mysql-test/tokudb_bugs/t/5585-master.opt
index acad193fd76..acad193fd76 100644
--- a/mysql-test/suite/tokudb.bugs/t/5585-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5585-master.opt
diff --git a/mysql-test/suite/tokudb.bugs/t/5585.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5585.test
index 6cc5fb223c0..6cc5fb223c0 100644
--- a/mysql-test/suite/tokudb.bugs/t/5585.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5585.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5695.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5695.test
index 8ca6ffd19f8..8ca6ffd19f8 100644
--- a/mysql-test/suite/tokudb.bugs/t/5695.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5695.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5733_innodb.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test
index 09d0162dfee..09d0162dfee 100644
--- a/mysql-test/suite/tokudb.bugs/t/5733_innodb.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5733_tokudb.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test
index 659caafd5ac..659caafd5ac 100644
--- a/mysql-test/suite/tokudb.bugs/t/5733_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5951.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5951.test
index 71cebe681b8..71cebe681b8 100644
--- a/mysql-test/suite/tokudb.bugs/t/5951.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5951.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5974-2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5974-2.test
index cc907c6d669..cc907c6d669 100644
--- a/mysql-test/suite/tokudb.bugs/t/5974-2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5974-2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/5974.test b/storage/tokudb/mysql-test/tokudb_bugs/t/5974.test
index 6de9886aae5..6de9886aae5 100644
--- a/mysql-test/suite/tokudb.bugs/t/5974.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/5974.test
diff --git a/mysql-test/suite/tokudb.bugs/t/6053.test b/storage/tokudb/mysql-test/tokudb_bugs/t/6053.test
index c628525acdd..c628525acdd 100644
--- a/mysql-test/suite/tokudb.bugs/t/6053.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/6053.test
diff --git a/mysql-test/suite/tokudb.bugs/t/6684.test b/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test
index 63ddf752512..63ddf752512 100644
--- a/mysql-test/suite/tokudb.bugs/t/6684.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test
diff --git a/mysql-test/suite/tokudb.bugs/t/889.test b/storage/tokudb/mysql-test/tokudb_bugs/t/889.test
index cbd73a94699..cbd73a94699 100644
--- a/mysql-test/suite/tokudb.bugs/t/889.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/889.test
diff --git a/mysql-test/suite/tokudb.bugs/t/895.test b/storage/tokudb/mysql-test/tokudb_bugs/t/895.test
index c66401977b5..c66401977b5 100644
--- a/mysql-test/suite/tokudb.bugs/t/895.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/895.test
diff --git a/mysql-test/suite/tokudb.bugs/t/94.test b/storage/tokudb/mysql-test/tokudb_bugs/t/94.test
index 0f18790acf9..0f18790acf9 100644
--- a/mysql-test/suite/tokudb.bugs/t/94.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/94.test
diff --git a/mysql-test/suite/tokudb.bugs/t/alter_external_lock_assert.test b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_external_lock_assert.test
index 176d2c8ded4..176d2c8ded4 100644
--- a/mysql-test/suite/tokudb.bugs/t/alter_external_lock_assert.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_external_lock_assert.test
diff --git a/mysql-test/suite/tokudb.bugs/t/alter_part_tokudb_bug_155.test b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_part_tokudb_bug_155.test
index c94d755bd89..c94d755bd89 100644
--- a/mysql-test/suite/tokudb.bugs/t/alter_part_tokudb_bug_155.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_part_tokudb_bug_155.test
diff --git a/mysql-test/suite/tokudb.bugs/t/alter_table_copy_table.test b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
index 6e4433183b0..6e4433183b0 100644
--- a/mysql-test/suite/tokudb.bugs/t/alter_table_copy_table.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bulk_fetch.test b/storage/tokudb/mysql-test/tokudb_bugs/t/bulk_fetch.test
index df76a882644..df76a882644 100644
--- a/mysql-test/suite/tokudb.bugs/t/bulk_fetch.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/bulk_fetch.test
diff --git a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test
index d57a59b22e5..d57a59b22e5 100755
--- a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test
diff --git a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test
index 1645c29deaa..1645c29deaa 100755
--- a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock_2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock_3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test
index 64c0f491f9a..64c0f491f9a 100755
--- a/mysql-test/suite/tokudb.bugs/t/checkpoint_lock_3.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test
diff --git a/mysql-test/suite/tokudb.bugs/t/commit_index_end_1.test b/storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_1.test
index 5d6f1364c4c..5d6f1364c4c 100644
--- a/mysql-test/suite/tokudb.bugs/t/commit_index_end_1.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_1.test
diff --git a/mysql-test/suite/tokudb.bugs/t/commit_index_end_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_2.test
index 68988e29486..68988e29486 100644
--- a/mysql-test/suite/tokudb.bugs/t/commit_index_end_2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/commit_index_end_2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db397_delete_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
index 00751ed2346..00751ed2346 100644
--- a/mysql-test/suite/tokudb.bugs/t/db397_delete_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db397_insert_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
index f32496e524d..f32496e524d 100644
--- a/mysql-test/suite/tokudb.bugs/t/db397_insert_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db397_update_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
index f1407e6488a..f1407e6488a 100644
--- a/mysql-test/suite/tokudb.bugs/t/db397_update_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db739_insert.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_insert.test
index ad7c8d614a3..ad7c8d614a3 100644
--- a/mysql-test/suite/tokudb.bugs/t/db739_insert.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_insert.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db739_replace.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_replace.test
index 4872527e425..4872527e425 100644
--- a/mysql-test/suite/tokudb.bugs/t/db739_replace.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_replace.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db739_upsert.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_upsert.test
index 7fcd1731a0b..7fcd1731a0b 100644
--- a/mysql-test/suite/tokudb.bugs/t/db739_upsert.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db739_upsert.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db743.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db743.test
index 5e2bc3e157c..5e2bc3e157c 100644
--- a/mysql-test/suite/tokudb.bugs/t/db743.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db743.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test
index 97dda1cb1b8..97dda1cb1b8 100644
--- a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_1.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test
index 3ef66a4b1e6..3ef66a4b1e6 100644
--- a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_1.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_1_pick.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test
index b8044641109..b8044641109 100644
--- a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_1_pick.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test
index ca10218cb05..ca10218cb05 100644
--- a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_2_pick.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2_pick.test
index 2cc55ec864d..2cc55ec864d 100644
--- a/mysql-test/suite/tokudb.bugs/t/db756_card_part_hash_2_pick.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2_pick.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db757_part_alter_analyze.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test
index fc1599591be..fc1599591be 100644
--- a/mysql-test/suite/tokudb.bugs/t/db757_part_alter_analyze.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db762.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db762.test
index 4428e9df8ec..4428e9df8ec 100644
--- a/mysql-test/suite/tokudb.bugs/t/db762.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db762.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db766.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db766.test
index e7d082f4638..e7d082f4638 100644
--- a/mysql-test/suite/tokudb.bugs/t/db766.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db766.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db768.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db768.test
index be2155f5c18..be2155f5c18 100644
--- a/mysql-test/suite/tokudb.bugs/t/db768.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db768.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db771.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db771.test
index 039ad7471c1..039ad7471c1 100644
--- a/mysql-test/suite/tokudb.bugs/t/db771.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db771.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db788-optimize-index-name.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db788-optimize-index-name.test
index 57e41db4239..57e41db4239 100644
--- a/mysql-test/suite/tokudb.bugs/t/db788-optimize-index-name.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db788-optimize-index-name.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db801.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db801.test
index 8a8fcea1496..8a8fcea1496 100644
--- a/mysql-test/suite/tokudb.bugs/t/db801.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db801.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db805.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db805.test
index 1114de6b325..1114de6b325 100644
--- a/mysql-test/suite/tokudb.bugs/t/db805.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db805.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db806.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db806.test
index 3815e59f78c..3815e59f78c 100644
--- a/mysql-test/suite/tokudb.bugs/t/db806.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db806.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db811.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db811.test
index 509f482765e..509f482765e 100644
--- a/mysql-test/suite/tokudb.bugs/t/db811.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db811.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db811s.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db811s.test
index 5b8c6ed79d3..5b8c6ed79d3 100644
--- a/mysql-test/suite/tokudb.bugs/t/db811s.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db811s.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db817.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db817.test
index 53c9edc3893..53c9edc3893 100644
--- a/mysql-test/suite/tokudb.bugs/t/db817.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db817.test
diff --git a/mysql-test/suite/tokudb.bugs/t/db823.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db823.test
index 2e01c0e5797..2e01c0e5797 100644
--- a/mysql-test/suite/tokudb.bugs/t/db823.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db823.test
diff --git a/mysql-test/suite/tokudb.bugs/t/dict_leak_3518.test b/storage/tokudb/mysql-test/tokudb_bugs/t/dict_leak_3518.test
index a29e74c65c6..a29e74c65c6 100644
--- a/mysql-test/suite/tokudb.bugs/t/dict_leak_3518.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/dict_leak_3518.test
diff --git a/mysql-test/suite/tokudb.bugs/t/disabled.def b/storage/tokudb/mysql-test/tokudb_bugs/t/disabled.def
index 8c755dde8f5..8c755dde8f5 100644
--- a/mysql-test/suite/tokudb.bugs/t/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/disabled.def
diff --git a/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test b/storage/tokudb/mysql-test/tokudb_bugs/t/expand_tinytext_text.test
index 32c894cb865..32c894cb865 100644
--- a/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/expand_tinytext_text.test
diff --git a/mysql-test/suite/tokudb.bugs/t/fileops-2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-2.test
index 8eadd9aa102..8eadd9aa102 100755
--- a/mysql-test/suite/tokudb.bugs/t/fileops-2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/fileops-3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-3.test
index adde9bc69a5..adde9bc69a5 100755
--- a/mysql-test/suite/tokudb.bugs/t/fileops-3.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-3.test
diff --git a/mysql-test/suite/tokudb.bugs/t/fileops-4.test b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-4.test
index e7ca9304541..e7ca9304541 100755
--- a/mysql-test/suite/tokudb.bugs/t/fileops-4.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops-4.test
diff --git a/mysql-test/suite/tokudb.bugs/t/fileops.test b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops.test
index 164df8bf944..164df8bf944 100755
--- a/mysql-test/suite/tokudb.bugs/t/fileops.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/fileops.test
diff --git a/mysql-test/suite/tokudb.bugs/t/frm_store.test b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store.test
index 6100d9aeec2..6100d9aeec2 100644
--- a/mysql-test/suite/tokudb.bugs/t/frm_store.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store.test
diff --git a/mysql-test/suite/tokudb.bugs/t/frm_store2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store2.test
index e1acea13ed7..e1acea13ed7 100644
--- a/mysql-test/suite/tokudb.bugs/t/frm_store2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/frm_store3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store3.test
index 17a124249da..17a124249da 100644
--- a/mysql-test/suite/tokudb.bugs/t/frm_store3.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/frm_store3.test
diff --git a/mysql-test/suite/tokudb.bugs/t/ft-index-40.test b/storage/tokudb/mysql-test/tokudb_bugs/t/ft-index-40.test
index 56f7f787d6d..56f7f787d6d 100644
--- a/mysql-test/suite/tokudb.bugs/t/ft-index-40.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/ft-index-40.test
diff --git a/mysql-test/suite/tokudb.bugs/t/index_read.test b/storage/tokudb/mysql-test/tokudb_bugs/t/index_read.test
index b7820e5705f..b7820e5705f 100755
--- a/mysql-test/suite/tokudb.bugs/t/index_read.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/index_read.test
diff --git a/mysql-test/suite/tokudb.bugs/t/leak172.test b/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test
index fd4c5fad534..fd4c5fad534 100644
--- a/mysql-test/suite/tokudb.bugs/t/leak172.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test
diff --git a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_empty.test b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_empty.test
index 0a001c2736d..0a001c2736d 100644
--- a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_empty.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_empty.test
diff --git a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_left.test b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_left.test
index 44d5aef3e99..44d5aef3e99 100644
--- a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_left.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_left.test
diff --git a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_middle.test b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_middle.test
index 03a31ba4978..03a31ba4978 100644
--- a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_middle.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_middle.test
diff --git a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_right.test b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_right.test
index a62241df66c..a62241df66c 100644
--- a/mysql-test/suite/tokudb.bugs/t/lock_uniq_key_right.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/lock_uniq_key_right.test
diff --git a/mysql-test/suite/tokudb.bugs/t/mdev4533.test b/storage/tokudb/mysql-test/tokudb_bugs/t/mdev4533.test
index 87f64dc704f..87f64dc704f 100644
--- a/mysql-test/suite/tokudb.bugs/t/mdev4533.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/mdev4533.test
diff --git a/mysql-test/suite/tokudb.bugs/t/mdev5932.test b/storage/tokudb/mysql-test/tokudb_bugs/t/mdev5932.test
index 879b57ade63..879b57ade63 100644
--- a/mysql-test/suite/tokudb.bugs/t/mdev5932.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/mdev5932.test
diff --git a/mysql-test/suite/tokudb.bugs/t/optimize_temp_table_tokudb.test b/storage/tokudb/mysql-test/tokudb_bugs/t/optimize_temp_table_tokudb.test
index f652e3748e5..f652e3748e5 100644
--- a/mysql-test/suite/tokudb.bugs/t/optimize_temp_table_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/optimize_temp_table_tokudb.test
diff --git a/mysql-test/suite/tokudb.bugs/t/rpl_mixed_replace_into.test b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_mixed_replace_into.test
index 05e6e2fb228..05e6e2fb228 100644
--- a/mysql-test/suite/tokudb.bugs/t/rpl_mixed_replace_into.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_mixed_replace_into.test
diff --git a/mysql-test/suite/tokudb.bugs/t/rpl_row_replace_into.test b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_row_replace_into.test
index 062f11e0ed9..062f11e0ed9 100644
--- a/mysql-test/suite/tokudb.bugs/t/rpl_row_replace_into.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_row_replace_into.test
diff --git a/mysql-test/suite/tokudb.bugs/t/rpl_stmt_replace_into.test b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_stmt_replace_into.test
index f7e4c7a09e0..f7e4c7a09e0 100644
--- a/mysql-test/suite/tokudb.bugs/t/rpl_stmt_replace_into.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/rpl_stmt_replace_into.test
diff --git a/mysql-test/suite/tokudb.bugs/t/simple_icp.test b/storage/tokudb/mysql-test/tokudb_bugs/t/simple_icp.test
index de9dd5824da..de9dd5824da 100644
--- a/mysql-test/suite/tokudb.bugs/t/simple_icp.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/simple_icp.test
diff --git a/mysql-test/suite/tokudb.bugs/t/subselect_index_next_same_bug_157.test b/storage/tokudb/mysql-test/tokudb_bugs/t/subselect_index_next_same_bug_157.test
index 7c7c98344a5..7c7c98344a5 100644
--- a/mysql-test/suite/tokudb.bugs/t/subselect_index_next_same_bug_157.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/subselect_index_next_same_bug_157.test
diff --git a/mysql-test/suite/tokudb.parts/t/suite.opt b/storage/tokudb/mysql-test/tokudb_bugs/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.parts/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/suite.opt
diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb718.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
index 735a88afed8..735a88afed8 100644
--- a/mysql-test/suite/tokudb.bugs/t/tokudb718.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_part_table_668.test
index 42dbb30058a..42dbb30058a 100644
--- a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_part_table_668.test
diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_simple_table_668.test
index 3903c2cef9f..3903c2cef9f 100644
--- a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb_drop_simple_table_668.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-1.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-1.test
index 8914a20786c..8914a20786c 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-1.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-1.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-2.test
index 0edf905208d..0edf905208d 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-2.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-2.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
index 4bca18ad109..4bca18ad109 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-3.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-4.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
index 5e4071c7b93..5e4071c7b93 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-4.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-5.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-5.test
index 47857039522..47857039522 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-5.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-5.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-6.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
index b6f770f0a68..b6f770f0a68 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-6.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
diff --git a/mysql-test/suite/tokudb.bugs/t/xa.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa.test
index 3d3d558c0c9..3d3d558c0c9 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa.test
diff --git a/mysql-test/suite/tokudb.parts/r/part_blocked_sql_func_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/part_blocked_sql_func_tokudb.result
index eb63369eb5d..eb63369eb5d 100644
--- a/mysql-test/suite/tokudb.parts/r/part_blocked_sql_func_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/part_blocked_sql_func_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/part_supported_sql_func_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result
index 82cbcbc311e..82cbcbc311e 100644
--- a/mysql-test/suite/tokudb.parts/r/part_supported_sql_func_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter1_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result
index bd4239fd26d..bd4239fd26d 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter1_1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result
index a59d3daeec7..a59d3daeec7 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter1_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result
index 9202e5f3a97..9202e5f3a97 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter2_1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result
index 8c7bc5ef296..8c7bc5ef296 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter2_1_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter2_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result
index 92cfa5d59b9..92cfa5d59b9 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter2_1_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter2_2_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result
index 1ae379ccc07..1ae379ccc07 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter2_2_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter2_2_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result
index 9ed9866a42f..9ed9866a42f 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter2_2_2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter3_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result
index db15f560799..db15f560799 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter3_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter3_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_alter4_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result
index b4e8e47b7d9..b4e8e47b7d9 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_alter4_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_auto_increment_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result
index b4ae303adff..b4ae303adff 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_auto_increment_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_basic_symlink_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_symlink_tokudb.result
index 586b8b21fbb..586b8b21fbb 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_basic_symlink_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_symlink_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_basic_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result
index a13a53bd5f9..a13a53bd5f9 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_basic_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_bit_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result
index dfc43f343ad..dfc43f343ad 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_bit_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_bit_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_char_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_char_tokudb.result
index fab08c91877..fab08c91877 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_char_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_char_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_datetime_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result
index a5a1eb1127e..a5a1eb1127e 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_datetime_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_datetime_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_debug_sync_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result
index 7776c44c8e8..7776c44c8e8 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_debug_sync_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_debug_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result
index 1a89df3eb1e..1a89df3eb1e 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_debug_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_decimal_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result
index cc4fe53982e..cc4fe53982e 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_decimal_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_decimal_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_engine_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result
index 7914785d27f..7914785d27f 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_engine_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_engine_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_myisam_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_myisam_tokudb.result
index 0659b907c2d..0659b907c2d 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_myisam_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_myisam_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result
index 44bd80891f7..44bd80891f7 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_1_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_4_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_4_tokudb.result
index 35f3499fce7..35f3499fce7 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_4_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_4_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_5_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result
index e539c37a0b4..e539c37a0b4 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_5_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_7_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_7_tokudb.result
index 8ae4bfd3d3a..8ae4bfd3d3a 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_7_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_7_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_8_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result
index b252fc616b1..b252fc616b1 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_qa_8_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exch_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_tokudb.result
index d444e2e3558..d444e2e3558 100755
--- a/mysql-test/suite/tokudb.parts/r/partition_exch_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_exchange_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result
index 802ea78353e..802ea78353e 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_exchange_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exchange_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_float_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result
index 6dcd9048dc5..6dcd9048dc5 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_float_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_float_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_int_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result
index 2c3e7f6e093..2c3e7f6e093 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_int_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_int_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_parts_hash_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_hash_tokudb.result
index dbd64fe6120..dbd64fe6120 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_parts_hash_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_hash_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_parts_inv_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_inv_tokudb.result
index 9e606d39c40..9e606d39c40 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_parts_inv_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_inv_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_parts_key_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_key_tokudb.result
index 5cdb2978963..5cdb2978963 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_parts_key_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_key_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_parts_list_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_list_tokudb.result
index 99bd02e6c01..99bd02e6c01 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_parts_list_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_list_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_parts_range_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_range_tokudb.result
index b48c25284c6..b48c25284c6 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_parts_range_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_parts_range_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_key_list_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_key_list_tokudb.result
index e403bec400d..e403bec400d 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_key_list_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_key_list_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_key_range_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_key_range_tokudb.result
index 7eb45b104c2..7eb45b104c2 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_key_range_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_key_range_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_list_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_list_tokudb.result
index 984e02db042..984e02db042 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_list_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_list_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_range_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_range_tokudb.result
index 9a6aaef0420..9a6aaef0420 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_max_sub_parts_range_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_max_sub_parts_range_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc0_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result
index 1442a99bbbb..1442a99bbbb 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc0_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc0_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc10_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result
index 84d350fcdfa..84d350fcdfa 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc10_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc10_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result
index 0a882a532e5..0a882a532e5 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc1_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc1_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc2_tokudb.result
index 2bada637ab1..2bada637ab1 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_mgm_lc2_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_mgm_lc2_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_reorganize_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_reorganize_tokudb.result
index 3e5fc1c4fea..3e5fc1c4fea 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_reorganize_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_reorganize_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_special_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result
index 73c6d1806ee..73c6d1806ee 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_special_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_special_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_syntax_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result
index c296c051249..c296c051249 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_syntax_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/r/partition_value_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_value_tokudb.result
index 716f80d5777..716f80d5777 100644
--- a/mysql-test/suite/tokudb.parts/r/partition_value_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_value_tokudb.result
diff --git a/mysql-test/suite/tokudb.parts/t/disabled.def b/storage/tokudb/mysql-test/tokudb_parts/t/disabled.def
index 68d7693612f..68d7693612f 100644
--- a/mysql-test/suite/tokudb.parts/t/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/disabled.def
diff --git a/mysql-test/suite/tokudb.parts/t/part_blocked_sql_func_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/part_blocked_sql_func_tokudb.test
index 73447c05ced..73447c05ced 100644
--- a/mysql-test/suite/tokudb.parts/t/part_blocked_sql_func_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/part_blocked_sql_func_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/part_supported_sql_func_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/part_supported_sql_func_tokudb.test
index 89f7413c884..89f7413c884 100644
--- a/mysql-test/suite/tokudb.parts/t/part_supported_sql_func_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/part_supported_sql_func_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter1_1_2_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_1_2_tokudb.test
index eaeefb89e69..eaeefb89e69 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter1_1_2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_1_2_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter1_1_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_1_tokudb.test
index 8f8599256ac..8f8599256ac 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter1_1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_1_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter1_2_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_2_tokudb.test
index 35efa289034..35efa289034 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter1_2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter1_2_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter2_1_1_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_1_1_tokudb.test
index 0608a1394cc..0608a1394cc 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter2_1_1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_1_1_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter2_1_2_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_1_2_tokudb.test
index c403c4c6996..c403c4c6996 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter2_1_2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_1_2_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter2_2_1_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_2_1_tokudb.test
index db5a1eef90c..db5a1eef90c 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter2_2_1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_2_1_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter2_2_2_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_2_2_tokudb.test
index 09202cb8f4b..09202cb8f4b 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter2_2_2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter2_2_2_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter3_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter3_tokudb.test
index e0e6a307813..e0e6a307813 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter3_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter3_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_alter4_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter4_tokudb.test
index 93a3a0cbdce..93a3a0cbdce 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_alter4_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_alter4_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_auto_increment_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_auto_increment_tokudb.test
index ceec2fda9ee..ceec2fda9ee 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_auto_increment_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_auto_increment_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_basic_symlink_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_basic_symlink_tokudb.test
index 0c048e61793..0c048e61793 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_basic_symlink_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_basic_symlink_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_basic_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_basic_tokudb.test
index a5256d83c82..a5256d83c82 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_basic_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_basic_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_bit_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_bit_tokudb.test
index c87d153d959..c87d153d959 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_bit_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_bit_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_char_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_char_tokudb.test
index 430550b5a80..430550b5a80 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_char_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_char_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_datetime_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_datetime_tokudb.test
index 29ca63a24cd..29ca63a24cd 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_datetime_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_datetime_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_debug_sync_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_sync_tokudb-master.opt
index 9854fda301d..9854fda301d 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_debug_sync_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_sync_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_debug_sync_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_sync_tokudb.test
index be14d8814f0..be14d8814f0 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_debug_sync_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_sync_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_debug_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb-master.opt
index d57f32b54fb..d57f32b54fb 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_debug_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_debug_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb.test
index a05f4cbb2e8..a05f4cbb2e8 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_debug_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_decimal_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_decimal_tokudb.test
index 8c488956ce6..8c488956ce6 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_decimal_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_decimal_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_engine_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_engine_tokudb.test
index 604d0201cd9..604d0201cd9 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_engine_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_engine_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_myisam_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_myisam_tokudb.test
index 01e0ccfd497..01e0ccfd497 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_myisam_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_myisam_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_1_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_1_tokudb.test
index a1dea9d7c4d..a1dea9d7c4d 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_1_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_4_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_4_tokudb.test
index 3dff27ee43e..3dff27ee43e 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_4_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_4_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_5_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_5_tokudb.test
index 95762dc1c5b..95762dc1c5b 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_5_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_5_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_7_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_7_tokudb.test
index 85eaec324ac..85eaec324ac 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_7_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_7_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_8_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_8_tokudb.test
index 97a45e69d4b..97a45e69d4b 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_qa_8_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_qa_8_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exch_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_tokudb.test
index 7985217a3d5..7985217a3d5 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exch_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exch_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_exchange_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exchange_tokudb.test
index c56b0eff0df..c56b0eff0df 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_exchange_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_exchange_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_float_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_float_tokudb.test
index 82b1f4ead3a..82b1f4ead3a 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_float_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_float_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_int_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_int_tokudb.test
index e58defc932f..e58defc932f 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_int_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_int_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_hash_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_hash_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_hash_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_hash_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_hash_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_hash_tokudb.test
index 3cf7a15c57a..3cf7a15c57a 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_hash_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_hash_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_inv_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_inv_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_inv_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_inv_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_inv_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_inv_tokudb.test
index 33749b5e8be..33749b5e8be 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_inv_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_inv_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_key_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_key_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_key_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_key_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_key_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_key_tokudb.test
index cdda123e9e3..cdda123e9e3 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_key_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_key_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_list_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_list_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_list_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_list_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_list_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_list_tokudb.test
index 8729bffba58..8729bffba58 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_list_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_list_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_range_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_range_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_range_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_range_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_parts_range_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_range_tokudb.test
index b3cb235de28..b3cb235de28 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_parts_range_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_parts_range_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_list_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_list_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_list_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_list_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_list_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_list_tokudb.test
index 78e119a9fba..78e119a9fba 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_list_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_list_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_range_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_range_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_range_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_range_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_range_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_range_tokudb.test
index e7fecb7bc33..e7fecb7bc33 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_key_range_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_key_range_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_list_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_list_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_list_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_list_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_list_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_list_tokudb.test
index a4258c93dc8..a4258c93dc8 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_list_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_list_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_range_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_range_tokudb-master.opt
index c189eede9e4..c189eede9e4 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_range_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_range_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_range_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_range_tokudb.test
index 626a6aab55d..626a6aab55d 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_max_sub_parts_range_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_max_sub_parts_range_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc0_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc0_tokudb.test
index fad71ddfff1..fad71ddfff1 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc0_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc0_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc10_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc10_tokudb.test
index 365c79c46e5..365c79c46e5 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc10_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc10_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc1_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc1_tokudb-master.opt
index 62ab6dad1e0..62ab6dad1e0 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc1_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc1_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc1_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc1_tokudb.test
index 4925859595e..4925859595e 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc1_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc1_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc2_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc2_tokudb-master.opt
index f18979f5a6a..f18979f5a6a 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc2_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc2_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc2_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc2_tokudb.test
index e4463393b4e..e4463393b4e 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_mgm_lc2_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_mgm_lc2_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_reorganize_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_reorganize_tokudb.test
index 9d7331adce5..9d7331adce5 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_reorganize_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_reorganize_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_special_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_special_tokudb-master.opt
index 624645d75c7..624645d75c7 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_special_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_special_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_special_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_special_tokudb.test
index 7d3f4d6a546..7d3f4d6a546 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_special_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_special_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_syntax_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_syntax_tokudb.test
index 3a7d15e3fef..3a7d15e3fef 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_syntax_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_syntax_tokudb.test
diff --git a/mysql-test/suite/tokudb.parts/t/partition_tokudb_status_file-master.opt b/storage/tokudb/mysql-test/tokudb_parts/t/partition_tokudb_status_file-master.opt
index 779962e8fca..779962e8fca 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_tokudb_status_file-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_tokudb_status_file-master.opt
diff --git a/mysql-test/suite/tokudb.parts/t/partition_value_tokudb.test b/storage/tokudb/mysql-test/tokudb_parts/t/partition_value_tokudb.test
index db1e020d521..db1e020d521 100644
--- a/mysql-test/suite/tokudb.parts/t/partition_value_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/partition_value_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/suite.opt b/storage/tokudb/mysql-test/tokudb_parts/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.rpl/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_parts/t/suite.opt
diff --git a/mysql-test/suite/tokudb.rpl/combinations b/storage/tokudb/mysql-test/tokudb_rpl/combinations
index 07042c2cbec..07042c2cbec 100644
--- a/mysql-test/suite/tokudb.rpl/combinations
+++ b/storage/tokudb/mysql-test/tokudb_rpl/combinations
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_deadlock_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_deadlock_tokudb.result
index a64b5dcbeed..a64b5dcbeed 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_deadlock_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_deadlock_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_extra_col_master_tokudb.result
index 63cc27481c5..63cc27481c5 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_extra_col_master_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_extra_col_master_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_extra_col_slave_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_extra_col_slave_tokudb.result
index 120f4bc9442..120f4bc9442 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_extra_col_slave_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_extra_col_slave_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_foreign_key_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_foreign_key_tokudb.result
index cdab171d413..cdab171d413 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_foreign_key_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_foreign_key_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_mixed_row_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_mixed_row_tokudb.result
index 75cfb927a87..75cfb927a87 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_mixed_row_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_mixed_row_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_not_null_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_not_null_tokudb.result
index 59bd2585395..59bd2585395 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_not_null_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_not_null_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb.result
index 7c76cccd4d1..7c76cccd4d1 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_delete_pk.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_delete_pk.result
index afbc4b50da8..afbc4b50da8 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_delete_pk.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_delete_pk.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result
index 7aab8947940..7aab8947940 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_write_pk.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_write_pk.result
index 64b495350c2..64b495350c2 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_write_pk.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_parallel_tokudb_write_pk.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_partition_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_partition_tokudb.result
index de9f1fbc122..de9f1fbc122 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_partition_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_partition_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_relay_space_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_relay_space_tokudb.result
index 20508747c25..20508747c25 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_relay_space_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_relay_space_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_basic_3tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_basic_3tokudb.result
index 5bff2ac389e..5bff2ac389e 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_basic_3tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_basic_3tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_blob_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_blob_tokudb.result
index 0741a616eda..0741a616eda 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_blob_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_blob_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_log_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_log_tokudb.result
index 87ffbca71bc..87ffbca71bc 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_log_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_log_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_rec_comp_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_rec_comp_tokudb.result
index 8dcea0daff7..8dcea0daff7 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_rec_comp_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_rec_comp_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_sp002_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_sp002_tokudb.result
index 65fecef606b..65fecef606b 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_sp002_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_sp002_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_sp007_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_sp007_tokudb.result
index b783e42bd7b..b783e42bd7b 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_sp007_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_sp007_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_row_tabledefs_3tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_tabledefs_3tokudb.result
index 13e80030937..13e80030937 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_row_tabledefs_3tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_row_tabledefs_3tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_set_null_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_set_null_tokudb.result
index d2bc4c148d5..d2bc4c148d5 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_set_null_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_set_null_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_stm_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_stm_tokudb.result
index 80d24bd31b2..80d24bd31b2 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_stm_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_stm_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_bug28430.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_bug28430.result
index 009c020b496..009c020b496 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_bug28430.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_bug28430.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_bug30888.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_bug30888.result
index bfcb5a92b68..bfcb5a92b68 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_bug30888.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_bug30888.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_delete_pk.result
index 6fab29177d7..6fab29177d7 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_delete_pk.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk_lookup1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_delete_pk_lookup1.result
index f8efd5e04ee..f8efd5e04ee 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk_lookup1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_delete_pk_lookup1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_mixed_ddl.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_mixed_ddl.result
index 7f2e9465829..7f2e9465829 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_mixed_ddl.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_mixed_ddl.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_mixed_dml.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_mixed_dml.result
index c11ae61b3ca..c11ae61b3ca 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_mixed_dml.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_mixed_dml.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ff.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_ff.result
index 76a5e31b969..76a5e31b969 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ff.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_ff.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ft.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_ft.result
index 2930cb019b4..2930cb019b4 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ft.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_ft.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tf.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_tf.result
index 76a5e31b969..76a5e31b969 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tf.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_tf.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tt.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_tt.result
index 0cba2a1cddb..0cba2a1cddb 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tt.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_read_only_tt.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result
index 50f43ebe5bf..50f43ebe5bf 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result
index 9e7f932a3c9..9e7f932a3c9 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result
index 348734b206d..348734b206d 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result
index bfd640e52e9..bfd640e52e9 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup0.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_unique_uc0_lookup0.result
index faf969f851a..faf969f851a 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup0.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_unique_uc0_lookup0.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_unique_uc0_lookup1.result
index 9ac87512f80..9ac87512f80 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_update_unique_uc0_lookup1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_pk.result
index ea1b84f8138..ea1b84f8138 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_pk.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk_uc1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_pk_uc1.result
index c846ec81612..c846ec81612 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk_uc1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_pk_uc1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_unique.result
index 808303387d5..808303387d5 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_unique.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique_uc1.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_unique_uc1.result
index a40548cec62..a40548cec62 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique_uc1.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_tokudb_write_unique_uc1.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_truncate_3tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_truncate_3tokudb.result
index 8c2fec847a9..8c2fec847a9 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_truncate_3tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_truncate_3tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/rpl_typeconv_tokudb.result b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_typeconv_tokudb.result
index 426c5dbeb3f..426c5dbeb3f 100644
--- a/mysql-test/suite/tokudb.rpl/r/rpl_typeconv_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/rpl_typeconv_tokudb.result
diff --git a/mysql-test/suite/tokudb.rpl/r/tokudb_innodb_xa_crash.result b/storage/tokudb/mysql-test/tokudb_rpl/r/tokudb_innodb_xa_crash.result
index add5e6b9529..add5e6b9529 100644
--- a/mysql-test/suite/tokudb.rpl/r/tokudb_innodb_xa_crash.result
+++ b/storage/tokudb/mysql-test/tokudb_rpl/r/tokudb_innodb_xa_crash.result
diff --git a/mysql-test/suite/tokudb.rpl/t/disabled.def b/storage/tokudb/mysql-test/tokudb_rpl/t/disabled.def
index 30bc9fea7c5..30bc9fea7c5 100644
--- a/mysql-test/suite/tokudb.rpl/t/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/disabled.def
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_deadlock_tokudb-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_deadlock_tokudb-slave.opt
index 3819e7c3f7b..3819e7c3f7b 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_deadlock_tokudb-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_deadlock_tokudb-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_deadlock_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_deadlock_tokudb.test
index 86d28a12ad3..86d28a12ad3 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_deadlock_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_deadlock_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_extra_col_master_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_extra_col_master_tokudb.test
index 4ee8fd38010..4ee8fd38010 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_extra_col_master_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_extra_col_master_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_extra_col_slave_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_extra_col_slave_tokudb.test
index b3d157a513d..b3d157a513d 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_extra_col_slave_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_extra_col_slave_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_foreign_key_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_foreign_key_tokudb.test
index d798cfd4a62..d798cfd4a62 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_foreign_key_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_foreign_key_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_mixed_row_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_mixed_row_tokudb-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_mixed_row_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_mixed_row_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_not_null_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_not_null_tokudb.test
index 8fde1c3415b..8fde1c3415b 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_not_null_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_not_null_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb-master.opt
index 4426a9c9746..4426a9c9746 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb-slave.opt
index b351df53683..b351df53683 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb.test
index 23d2d6cdf51..23d2d6cdf51 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt
index 042156e63d1..042156e63d1 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_delete_pk.test
index bedeb9513be..bedeb9513be 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_delete_pk.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0-slave.opt
index fffefff5bcd..fffefff5bcd 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0.test
index 6dd9b660eed..6dd9b660eed 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_write_pk-slave.opt
index f2ed0286136..f2ed0286136 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_write_pk-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_write_pk.test
index 0ed12b34e1f..0ed12b34e1f 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_parallel_tokudb_write_pk.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_partition_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_partition_tokudb-master.opt
index 0eed7aaadad..0eed7aaadad 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_partition_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_partition_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_partition_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_partition_tokudb.test
index a80363cc91d..a80363cc91d 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_partition_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_partition_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_relay_space_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_relay_space_tokudb.test
index 232ec944c16..232ec944c16 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_relay_space_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_relay_space_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_basic_3tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_basic_3tokudb.test
index d600137bec4..d600137bec4 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_basic_3tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_basic_3tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_blob_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_blob_tokudb.test
index b96219a0c50..b96219a0c50 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_blob_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_blob_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_log_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_log_tokudb-master.opt
index 773ec62bef2..773ec62bef2 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_log_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_log_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_log_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_log_tokudb.test
index bc624d4d89c..bc624d4d89c 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_log_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_log_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_rec_comp_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_rec_comp_tokudb.test
index 8d84de1df7d..8d84de1df7d 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_rec_comp_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_rec_comp_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_sp002_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_sp002_tokudb.test
index 82c1e17f488..82c1e17f488 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_sp002_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_sp002_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_sp007_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_sp007_tokudb.test
index 6deaa68d23e..6deaa68d23e 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_sp007_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_sp007_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_row_tabledefs_3tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_tabledefs_3tokudb.test
index e4558d0e87a..e4558d0e87a 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_row_tabledefs_3tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_row_tabledefs_3tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_set_null_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_set_null_tokudb.test
index 78ae341b29f..78ae341b29f 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_set_null_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_set_null_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_stm_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_stm_tokudb.test
index 72daaefd3fb..72daaefd3fb 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_stm_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_stm_tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb-master.opt
index 0eed7aaadad..0eed7aaadad 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430-master.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430-master.opt
index 0eed7aaadad..0eed7aaadad 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430-master.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430-master.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430-slave.opt
index 0eed7aaadad..0eed7aaadad 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430.test
index 4cc7f032db9..4cc7f032db9 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug28430.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug28430.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug30888.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug30888.test
index 406e9c2a63a..406e9c2a63a 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_bug30888.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_bug30888.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk-slave.opt
index 93a2685e847..93a2685e847 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk.test
index bedeb9513be..bedeb9513be 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt
index 9a2fec628f9..9a2fec628f9 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk_lookup1.test
index 9e9aaede416..9e9aaede416 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_delete_pk_lookup1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_ddl.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_mixed_ddl.test
index 5614769307d..5614769307d 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_ddl.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_mixed_ddl.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_dml.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_mixed_dml.test
index 6147d321784..6147d321784 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_dml.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_mixed_dml.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ff-slave.opt
index 0240c9d6ae4..0240c9d6ae4 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ff-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ff.test
index 7b3e8f0c0d3..7b3e8f0c0d3 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ff.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ft-slave.opt
index e1ee193d4c1..e1ee193d4c1 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ft-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ft.test
index 7b3e8f0c0d3..7b3e8f0c0d3 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_ft.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tf-slave.opt
index e60afd0380a..e60afd0380a 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tf-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tf.test
index 7b3e8f0c0d3..7b3e8f0c0d3 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tf.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tt-slave.opt
index f6658646e65..f6658646e65 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tt-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tt.test
index 7b3e8f0c0d3..7b3e8f0c0d3 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_read_only_tt.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt
index 93a2685e847..93a2685e847 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test
index 6dd9b660eed..6dd9b660eed 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt
index a4ca1104425..a4ca1104425 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test
index 6dd9b660eed..6dd9b660eed 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt
index 4b1d21daf5f..4b1d21daf5f 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test
index 6dd9b660eed..6dd9b660eed 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt
index 239e19ac040..239e19ac040 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test
index 6dd9b660eed..6dd9b660eed 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup0-slave.opt
index 93a2685e847..93a2685e847 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup0-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup0.test
index 93fef3699d9..93fef3699d9 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup0.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup1-slave.opt
index a4ca1104425..a4ca1104425 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup1.test
index c8976db8ccd..c8976db8ccd 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_update_unique_uc0_lookup1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk-slave.opt
index 19b40f86454..19b40f86454 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk.test
index 0ed12b34e1f..0ed12b34e1f 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk_uc1-slave.opt
index 646a9991753..646a9991753 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk_uc1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk_uc1.test
index 0ed12b34e1f..0ed12b34e1f 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_pk_uc1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique-slave.opt
index 19b40f86454..19b40f86454 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique.test
index fc4c9597dac..fc4c9597dac 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique_uc1-slave.opt
index 9139a370e57..9139a370e57 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique_uc1-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique_uc1.test
index fc4c9597dac..fc4c9597dac 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_tokudb_write_unique_uc1.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_truncate_3tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_truncate_3tokudb.test
index 8c2cf7ca4ba..8c2cf7ca4ba 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_truncate_3tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_truncate_3tokudb.test
diff --git a/mysql-test/suite/tokudb.rpl/t/rpl_typeconv_tokudb.test b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_typeconv_tokudb.test
index 0f73e60f278..0f73e60f278 100644
--- a/mysql-test/suite/tokudb.rpl/t/rpl_typeconv_tokudb.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/rpl_typeconv_tokudb.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/suite.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/suite.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/tokudb_innodb_xa_crash-slave.opt b/storage/tokudb/mysql-test/tokudb_rpl/t/tokudb_innodb_xa_crash-slave.opt
index 978dfbc809e..978dfbc809e 100644
--- a/mysql-test/suite/tokudb.rpl/t/tokudb_innodb_xa_crash-slave.opt
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/tokudb_innodb_xa_crash-slave.opt
diff --git a/mysql-test/suite/tokudb.rpl/t/tokudb_innodb_xa_crash.test b/storage/tokudb/mysql-test/tokudb_rpl/t/tokudb_innodb_xa_crash.test
index 97818a597e2..97818a597e2 100644
--- a/mysql-test/suite/tokudb.rpl/t/tokudb_innodb_xa_crash.test
+++ b/storage/tokudb/mysql-test/tokudb_rpl/t/tokudb_innodb_xa_crash.test
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_delete_fraction.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_delete_fraction.result
index 41918883dd6..41918883dd6 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_delete_fraction.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_delete_fraction.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_in_background_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result
index 53e96810eda..53e96810eda 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_in_background_basic.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_mode_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_mode_basic.result
index e2a3059a5aa..e2a3059a5aa 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_mode_basic.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_mode_basic.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_throttle_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_throttle_basic.result
index 34317c7cb7b..34317c7cb7b 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_throttle_basic.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_throttle_basic.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_time_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_time_basic.result
index 2eac1fcc3a1..2eac1fcc3a1 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_time_basic.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_time_basic.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_auto_analyze.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_auto_analyze.result
index 5e22bc489cb..5e22bc489cb 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_auto_analyze.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_auto_analyze.result
diff --git a/mysql-test/suite/tokudb.sys_vars/r/tokudb_cardinality_scale_percent_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_cardinality_scale_percent_basic.result
index cac5d8b0dc7..cac5d8b0dc7 100644
--- a/mysql-test/suite/tokudb.sys_vars/r/tokudb_cardinality_scale_percent_basic.result
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_cardinality_scale_percent_basic.result
diff --git a/mysql-test/suite/tokudb/t/suite.opt b/storage/tokudb/mysql-test/tokudb_sys_vars/t/suite.opt
index 23511b05020..23511b05020 100644
--- a/mysql-test/suite/tokudb/t/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/suite.opt
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_delete_fraction.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_delete_fraction.test
index d5bd382740f..d5bd382740f 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_delete_fraction.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_delete_fraction.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_in_background_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test
index dfb2a0e416d..dfb2a0e416d 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_in_background_basic.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_mode_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_mode_basic.test
index 69def75bd3d..69def75bd3d 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_mode_basic.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_mode_basic.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_throttle_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_throttle_basic.test
index a3660b0626a..a3660b0626a 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_throttle_basic.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_throttle_basic.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_time_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_time_basic.test
index 3098934ee8c..3098934ee8c 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_time_basic.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_time_basic.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_auto_analyze.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_auto_analyze.test
index d9998508ae1..d9998508ae1 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_auto_analyze.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_auto_analyze.test
diff --git a/mysql-test/suite/tokudb.sys_vars/t/tokudb_cardinality_scale_percent_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_cardinality_scale_percent_basic.test
index 83063f04248..83063f04248 100644
--- a/mysql-test/suite/tokudb.sys_vars/t/tokudb_cardinality_scale_percent_basic.test
+++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_cardinality_scale_percent_basic.test