update tokudb tests for 10.0

13 files changed, 21 insertions, 30 deletions

diff --git a/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
index cf1311dd891..c198a6b4d7d 100644
--- a/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
+++ b/storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
@@ -2,4 +2,4 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 *** Bug #22169 ***
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a int, b int, c int, z int, y int, x int, r int, s int, t int, primary key (a,b), key (z), key(x), key(t));
-ERROR 23000: Duplicate entry '18-2' for key 'foo'
+ERROR 23000: Can't write; duplicate key in table 't1'
diff --git a/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
index 1b3373f4ce8..7acb727a8ea 100644
--- a/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
+++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
@@ -25,7 +25,7 @@ while ($1)
 }
 
 insert into t1 values (5,52,18,5,5,5,2,5,5);
---error ER_DUP_ENTRY
+--error ER_DUP_KEY
 create unique index foo on t1 (c,r);
 
 
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
index 59f0fc87861..21bfb990ba9 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
@@ -26,6 +26,7 @@ col1	col2
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
+ERROR 42000: Table 'test_enum' uses an extension that doesn't exist in this XYZ version
 set tokudb_disable_hot_alter=1;
 set tokudb_disable_slow_alter=0;
 ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
@@ -45,11 +46,12 @@ col1	col2
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4');
-Warnings:
-Warning	1265	Data truncated for column 'col2' at row 3
+ERROR 42000: Table 'test_enum' uses an extension that doesn't exist in this XYZ version
 set tokudb_disable_hot_alter=1;
 set tokudb_disable_slow_alter=0;
 ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4');
+Warnings:
+Warning	1265	Data truncated for column 'col2' at row 3
 SELECT * FROM test_enum;
 col1	col2
 1	value1
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
index 300aff81d20..9e1504a9d89 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
@@ -47,7 +47,5 @@ UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE t ADD KEY (c25);
-set tokudb_disable_slow_alter=0;
-ALTER TABLE t ADD KEY (c25);
 UPDATE t SET c27=0;
 drop table t;
diff --git a/storage/tokudb/mysql-test/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..45a12fba8d2 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
@@ -47,8 +47,5 @@ UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE t CHANGE COLUMN c25 x25 char(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
-set tokudb_disable_slow_alter=0;
-ALTER TABLE t CHANGE COLUMN c25 x25 char(1);
 UPDATE t SET c27=0;
 drop table t;
diff --git a/storage/tokudb/mysql-test/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..d5ff7e092fe 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
@@ -47,8 +47,5 @@ UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE t ALTER c120 DROP DEFAULT;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
-set tokudb_disable_slow_alter=0;
-ALTER TABLE t ALTER c120 DROP DEFAULT;
 UPDATE t SET c27=0;
 drop table t;
diff --git a/storage/tokudb/mysql-test/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..09b0deaf990 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
@@ -49,8 +49,5 @@ UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 ALTER TABLE t DROP KEY c25;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
-set tokudb_disable_slow_alter=0;
-ALTER TABLE t DROP KEY c25;
 UPDATE t SET c27=0;
 drop table t;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
index f6a3710ff6d..a91b9fa4d45 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
@@ -27,7 +27,7 @@ SELECT * FROM test_enum;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
-#--error ER_UNSUPPORTED_EXTENSION
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
 
 set tokudb_disable_hot_alter=1;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
index 75dcc91785d..70e2a07e4cc 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
@@ -53,10 +53,10 @@ ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
 UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
---error ER_UNSUPPORTED_EXTENSION
-ALTER TABLE t ADD KEY (c25);
-set tokudb_disable_slow_alter=0;
+#--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t ADD KEY (c25);
+#set tokudb_disable_slow_alter=0;
+#ALTER TABLE t ADD KEY (c25);
 UPDATE t SET c27=0;
 
 drop table t;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
index 83de4905587..048e39dc757 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
@@ -53,10 +53,10 @@ ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
 UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
---error ER_UNSUPPORTED_EXTENSION
-ALTER TABLE t CHANGE COLUMN c25 x25 char(1);
-set tokudb_disable_slow_alter=0;
+#--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN c25 x25 char(1);
+#set tokudb_disable_slow_alter=0;
+#ALTER TABLE t CHANGE COLUMN c25 x25 char(1);
 UPDATE t SET c27=0;
 
 drop table t;
diff --git a/storage/tokudb/mysql-test/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..a5695e8a4c6 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
@@ -53,10 +53,10 @@ ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
 UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
---error ER_UNSUPPORTED_EXTENSION
-ALTER TABLE t ALTER c120 DROP DEFAULT;
-set tokudb_disable_slow_alter=0;
+#--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t ALTER c120 DROP DEFAULT;
+#set tokudb_disable_slow_alter=0;
+#ALTER TABLE t ALTER c120 DROP DEFAULT;
 UPDATE t SET c27=0;
 
-drop table t;
\ No newline at end of file
+drop table t;
diff --git a/storage/tokudb/mysql-test/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..d2726c30ddd 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
@@ -55,10 +55,10 @@ ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
 UPDATE t SET c27=0;
 set tokudb_disable_hot_alter=0;
 set tokudb_disable_slow_alter=1;
---error ER_UNSUPPORTED_EXTENSION
-ALTER TABLE t DROP KEY c25;
-set tokudb_disable_slow_alter=0;
+#--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t DROP KEY c25;
+#set tokudb_disable_slow_alter=0;
+#ALTER TABLE t DROP KEY c25;
 UPDATE t SET c27=0;
 
-drop table t;
\ No newline at end of file
+drop table t;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/include/not_5_5.inc b/storage/tokudb/mysql-test/tokudb_bugs/include/not_5_5.inc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/storage/tokudb/mysql-test/tokudb_bugs/include/not_5_5.inc