Kouhei Sutou
null+****@clear*****
Thu Dec 5 11:30:31 JST 2013
Kouhei Sutou 2013-12-05 11:30:31 +0900 (Thu, 05 Dec 2013) New Revision: 5cbf9ade2571fa16b491a6381f33bb9d877a5c1f https://github.com/mroonga/mroonga/commit/5cbf9ade2571fa16b491a6381f33bb9d877a5c1f Message: test: use number instead of name in --error Because "--error WXXX" style is supported only by MariaDB 10.0. Older MySQL/MariaDB supports only "--error EXXX". We want to use these tests with all MySQL/MariaDB. So we use "--error NUMBER" instead of "--error WXXX". TODO: If all test target MySQL/MariaDB supports "--error WXXX" style, we should use it. Modified files: mysql-test/mroonga/storage/insert/t/TODO_SPLIT_ME.test mysql-test/mroonga/storage/update/t/virtual_column.test Modified: mysql-test/mroonga/storage/insert/t/TODO_SPLIT_ME.test (+4 -1) =================================================================== --- mysql-test/mroonga/storage/insert/t/TODO_SPLIT_ME.test 2013-12-05 11:23:51 +0900 (bb3cba6) +++ mysql-test/mroonga/storage/insert/t/TODO_SPLIT_ME.test 2013-12-05 11:30:31 +0900 (f21fc3b) @@ -84,7 +84,10 @@ set sql_mode=""; # warning WARN_DATA_TRUNCATED insert into t1 (c1,_id) values (1,1); set sql_mode="strict_all_tables"; ---error WARN_DATA_TRUNCATED +# We can't use WARN_DATA_TRUNCATED here because "WXXX" isn't supported +# MySQL 5.5, 5.6 and MariaDB 5.6. MariaDB 10.0 only supports it. +# We share this test with all MySQL servers. So we use number here. +--error 1265 insert into t1 (c1,_id) values (4,1); select * from t1; drop table t1; Modified: mysql-test/mroonga/storage/update/t/virtual_column.test (+4 -1) =================================================================== --- mysql-test/mroonga/storage/update/t/virtual_column.test 2013-12-05 11:23:51 +0900 (caa07a3) +++ mysql-test/mroonga/storage/update/t/virtual_column.test 2013-12-05 11:30:31 +0900 (83b0e41) @@ -32,7 +32,10 @@ set sql_mode=""; update t1 set _id = 10 where c1 = 1; select * from t1; set sql_mode="strict_all_tables"; ---error WARN_DATA_TRUNCATED +# We can't use WARN_DATA_TRUNCATED here because "WXXX" isn't supported +# MySQL 5.5, 5.6 and MariaDB 5.6. MariaDB 10.0 only supports it. +# We share this test with all MySQL servers. So we use number here. +--error 1265 update t1 set _id = 11 where c1 = 1; select * from t1; drop table t1; -------------- next part -------------- HTML����������������������������...Download