Browse Source

#40 fix mod_enum test portability

pull/73/head
Rich Prohaska 12 years ago
parent
commit
d94b22a2f9
  1. 4
      mysql-test/suite/tokudb.alter_table/r/mod_enum.result
  2. 2
      mysql-test/suite/tokudb.alter_table/t/mod_enum.test

4
mysql-test/suite/tokudb.alter_table/r/mod_enum.result

@ -26,7 +26,7 @@ col1 col2
set tokudb_disable_hot_alter=0; set tokudb_disable_hot_alter=0;
set tokudb_disable_slow_alter=1; set tokudb_disable_slow_alter=1;
ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
ERROR 42000: Table 'test_enum' uses an extension that doesn't exist in this MySQL version
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_hot_alter=1;
set tokudb_disable_slow_alter=0; set tokudb_disable_slow_alter=0;
ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
@ -46,7 +46,7 @@ col1 col2
set tokudb_disable_hot_alter=0; set tokudb_disable_hot_alter=0;
set tokudb_disable_slow_alter=1; set tokudb_disable_slow_alter=1;
ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4');
ERROR 42000: Table 'test_enum' uses an extension that doesn't exist in this MySQL version
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_hot_alter=1;
set tokudb_disable_slow_alter=0; set tokudb_disable_slow_alter=0;
ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4');

2
mysql-test/suite/tokudb.alter_table/t/mod_enum.test

@ -26,6 +26,7 @@ SELECT * FROM test_enum;
set tokudb_disable_hot_alter=0; set tokudb_disable_hot_alter=0;
set tokudb_disable_slow_alter=1; 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'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value3');
@ -43,6 +44,7 @@ SELECT * FROM test_enum;
set tokudb_disable_hot_alter=0; set tokudb_disable_hot_alter=0;
set tokudb_disable_slow_alter=1; 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','value2','value4'); ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4');

Loading…
Cancel
Save