database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

update tokudb tests for 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2014-03-26 22:31:17 +01:00
parent 06be773cdb
commit 06bdc441f0
13 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/tokudb/mysql-test/tokudb_add_index/r/add_index_6.result
View File

@@ -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'

2
storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test
View File

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

6
storage/tokudb/mysql-test/tokudb_alter_table/r/mod_enum.result
View File

@@ -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

2
storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_add_key.result
View File

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

3
storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_col_rename.result
View File

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

3
storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_default.result
View File

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

3
storage/tokudb/mysql-test/tokudb_alter_table/r/null_bytes_drop_key.result
View File

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

2
storage/tokudb/mysql-test/tokudb_alter_table/t/mod_enum.test
View File

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

6
storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_add_key.test
View File

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

6
storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_col_rename.test
View File

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

8
storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_default.test
View File

@@ -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;
drop table t;

8
storage/tokudb/mysql-test/tokudb_alter_table/t/null_bytes_drop_key.test
View File

@@ -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;
drop table t;

0
storage/tokudb/mysql-test/tokudb_bugs/include/not_5_5.inc Normal file
View File