diff options
Diffstat (limited to 'storage')
64 files changed, 175 insertions, 63 deletions
diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result index 34a591fb26c..d682455d86c 100644 --- a/storage/connect/mysql-test/connect/r/dir.result +++ b/storage/connect/mysql-test/connect/r/dir.result @@ -25,8 +25,10 @@ SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size; fname ftype size boys .txt 282 boyswin .txt 288 +SET sql_mode = ''; INSERT INTO t1 VALUES ('','','',''); ERROR HY000: Got error 174 'COLBLK SetBuffer: undefined Access Method' from CONNECT +SET sql_mode = DEFAULT; DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt'; ERROR HY000: Cannot get column info for table type DIR diff --git a/storage/connect/mysql-test/connect/r/mysql_exec.result b/storage/connect/mysql-test/connect/r/mysql_exec.result index b6606ab5978..fdf385333ca 100644 --- a/storage/connect/mysql-test/connect/r/mysql_exec.result +++ b/storage/connect/mysql-test/connect/r/mysql_exec.result @@ -16,7 +16,7 @@ message VARCHAR(255) FLAG=2) ENGINE=CONNECT TABLE_TYPE=MYSQL CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test' OPTION_LIST='Execsrc=1,maxerr=2'; SELECT * FROM t1 WHERE command IN ('Warning','Note', 'drop table if exists t1', -'create table t1 (id int key auto_increment, msg varchar(32) not null)', +'create table t1 (id int key auto_increment, msg varchar(32))', "insert into t1(msg) values('One'),(NULL),('Three')", "insert into t1 values(2,'Deux') on duplicate key update msg = 'Two'", "insert into t1(message) values('Four'),('Five'),('Six')", @@ -26,13 +26,11 @@ SELECT * FROM t1 WHERE command IN ('Warning','Note', command warnings number message drop table if exists t1 1 0 Affected rows Note 0 1051 Unknown table 'test.t1' -create table t1 (id int key auto_increment, msg varchar(32) not null) 0 0 Affected rows -insert into t1(msg) values('One'),(NULL),('Three') 1 3 Affected rows -Warning 0 1048 Column 'msg' cannot be null +create table t1 (id int key auto_increment, msg varchar(32)) 0 0 Affected rows +insert into t1(msg) values('One'),(NULL),('Three') 0 3 Affected rows insert into t1 values(2,'Deux') on duplicate key update msg = 'Two' 0 2 Affected rows insert into t1(message) values('Four'),('Five'),('Six') 0 1054 Remote: Unknown column 'message' in 'field list' -insert into t1(id) values(NULL) 1 1 Affected rows -Warning 0 1364 Field 'msg' doesn't have a default value +insert into t1(id) values(NULL) 0 1 Affected rows update t1 set msg = 'Four' where id = 4 0 1 Affected rows select * from t1 0 2 Result set columns # @@ -46,8 +44,7 @@ READS SQL DATA SELECT * FROM t1 WHERE command IN ('Warning','Note',cmd); CALL p1('insert into t1(id) values(NULL)'); command warnings number message -insert into t1(id) values(NULL) 1 1 Affected rows -Warning 0 1364 Field 'msg' doesn't have a default value +insert into t1(id) values(NULL) 0 1 Affected rows CALL p1('update t1 set msg = "Five" where id = 5'); command warnings number message update t1 set msg = "Five" where id = 5 0 1 Affected rows diff --git a/storage/connect/mysql-test/connect/r/mysql_new.result b/storage/connect/mysql-test/connect/r/mysql_new.result index 9236ee691e5..69402ff7532 100644 --- a/storage/connect/mysql-test/connect/r/mysql_new.result +++ b/storage/connect/mysql-test/connect/r/mysql_new.result @@ -203,7 +203,7 @@ t1 CREATE TABLE `t1` ( `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `e` year(4) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -INSERT INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); +INSERT IGNORE INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); Warnings: Note 1265 Data truncated for column 'a' at row 1 Note 1265 Data truncated for column 'c' at row 1 diff --git a/storage/connect/mysql-test/connect/r/unsigned.result b/storage/connect/mysql-test/connect/r/unsigned.result index b993133a3c4..ca5a5ffe31e 100644 --- a/storage/connect/mysql-test/connect/r/unsigned.result +++ b/storage/connect/mysql-test/connect/r/unsigned.result @@ -27,13 +27,13 @@ UPDATE t1 SET e = d; SELECT * FROM t1; a b c d e 255 65535 4294967295 18446744073709551615 18446744073709551615 -UPDATE t1 SET c = d; +UPDATE IGNORE t1 SET c = d; Warnings: Warning 1264 Out of range value for column 'c' at row 1 SELECT * FROM t1; a b c d e 255 65535 4294967295 18446744073709551615 18446744073709551615 -UPDATE t1 SET c = e; +UPDATE IGNORE t1 SET c = e; Warnings: Warning 1264 Out of range value for column 'c' at row 1 SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/r/upd.result b/storage/connect/mysql-test/connect/r/upd.result index fa519c4b688..8faf00896bb 100644 --- a/storage/connect/mysql-test/connect/r/upd.result +++ b/storage/connect/mysql-test/connect/r/upd.result @@ -1,3 +1,4 @@ +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE employee ( serialno CHAR(5) NOT NULL, @@ -1625,3 +1626,4 @@ serialno name sex title manager department secretary salary # DROP PROCEDURE test.tst_up; DROP TABLE employee; +SET sql_mode = DEFAULT; diff --git a/storage/connect/mysql-test/connect/t/dir.test b/storage/connect/mysql-test/connect/t/dir.test index fb69813d9f0..fdcedf6c2bd 100644 --- a/storage/connect/mysql-test/connect/t/dir.test +++ b/storage/connect/mysql-test/connect/t/dir.test @@ -24,9 +24,11 @@ SHOW CREATE TABLE t1; --replace_result $MYSQLD_DATADIR DATADIR/ SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size; +SET sql_mode = ''; # TODO: add a better error message --error ER_GET_ERRMSG INSERT INTO t1 VALUES ('','','',''); +SET sql_mode = DEFAULT; DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/t/mysql_exec.test b/storage/connect/mysql-test/connect/t/mysql_exec.test index 9226592eded..2fab0ee0a93 100644 --- a/storage/connect/mysql-test/connect/t/mysql_exec.test +++ b/storage/connect/mysql-test/connect/t/mysql_exec.test @@ -15,7 +15,7 @@ eval CREATE TABLE t1 ( SELECT * FROM t1 WHERE command IN ('Warning','Note', 'drop table if exists t1', - 'create table t1 (id int key auto_increment, msg varchar(32) not null)', + 'create table t1 (id int key auto_increment, msg varchar(32))', "insert into t1(msg) values('One'),(NULL),('Three')", "insert into t1 values(2,'Deux') on duplicate key update msg = 'Two'", "insert into t1(message) values('Four'),('Five'),('Six')", diff --git a/storage/connect/mysql-test/connect/t/mysql_new.test b/storage/connect/mysql-test/connect/t/mysql_new.test index de9cae7b87b..db9b1b704fc 100644 --- a/storage/connect/mysql-test/connect/t/mysql_new.test +++ b/storage/connect/mysql-test/connect/t/mysql_new.test @@ -306,7 +306,7 @@ DROP TABLE t1; CREATE TABLE t1 (a date, b datetime, c time, d timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, e year); SHOW CREATE TABLE t1; -INSERT INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); +INSERT IGNORE INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); SELECT * FROM t1; connection master; diff --git a/storage/connect/mysql-test/connect/t/unsigned.test b/storage/connect/mysql-test/connect/t/unsigned.test index 44eb832f8ae..48f6bdc835c 100644 --- a/storage/connect/mysql-test/connect/t/unsigned.test +++ b/storage/connect/mysql-test/connect/t/unsigned.test @@ -13,9 +13,9 @@ INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615); SELECT * FROM t1; UPDATE t1 SET e = d; SELECT * FROM t1; -UPDATE t1 SET c = d; +UPDATE IGNORE t1 SET c = d; SELECT * FROM t1; -UPDATE t1 SET c = e; +UPDATE IGNORE t1 SET c = e; SELECT * FROM t1; UPDATE t1 SET d = e; SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/t/upd.test b/storage/connect/mysql-test/connect/t/upd.test index a3716694c4a..28b566b5641 100644 --- a/storage/connect/mysql-test/connect/t/upd.test +++ b/storage/connect/mysql-test/connect/t/upd.test @@ -1,6 +1,8 @@ let $MYSQLD_DATADIR= `select @@datadir`; --copy_file $MTR_SUITE_DIR/std_data/employee.dat $MYSQLD_DATADIR/test/employee.dat +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; + CREATE TABLE employee ( serialno CHAR(5) NOT NULL, @@ -150,4 +152,6 @@ CALL test.tst_up(); DROP PROCEDURE test.tst_up; DROP TABLE employee; +SET sql_mode = DEFAULT; + --remove_file $MYSQLD_DATADIR/test/employee.dat diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result index 31906776bf4..c8360f2fbfa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `subject` text DEFAULT NULL, PRIMARY KEY (`internal_id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 -INSERT INTO diaries (subject, description) +INSERT IGNORE INTO diaries (subject, description) VALUES ("groonga (1)", "starting groonga."); Warnings: Warning 1364 Field 'internal_id' doesn't have a default value diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_zero_date.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_zero_date.result index b2364e1158e..9a979f571ee 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_zero_date.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_zero_date.result @@ -10,12 +10,18 @@ timestamps CREATE TABLE `timestamps` ( `create_dt` date DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 +SET sql_mode = ''; INSERT INTO timestamps (create_dt) VALUES ("2012-00-01"); Warnings: Warning 1265 Data truncated for column 'create_dt' at row 1 INSERT INTO timestamps (create_dt) VALUES ("2012-01-00"); Warnings: Warning 1265 Data truncated for column 'create_dt' at row 1 +SET sql_mode = DEFAULT; +INSERT INTO timestamps (create_dt) VALUES ("2012-00-01"); +ERROR 22007: Incorrect date value: '2012-00-01' for column 'create_dt' at row 1 +INSERT INTO timestamps (create_dt) VALUES ("2012-01-00"); +ERROR 22007: Incorrect date value: '2012-01-00' for column 'create_dt' at row 1 SELECT * FROM timestamps; id create_dt 1 2012-01-01 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_version_56_or_later_out_of_range.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_version_56_or_later_out_of_range.result index 7cca8d2f83e..c287abd79de 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_version_56_or_later_out_of_range.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_version_56_or_later_out_of_range.result @@ -12,11 +12,14 @@ diaries CREATE TABLE `diaries` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 -INSERT INTO diaries (title, created_at) -VALUES ('2012', '2012'); +SET sql_mode = ''; +INSERT INTO diaries (title, created_at) VALUES ('2012', '2012'); Warnings: Warning 1265 Data truncated for column 'created_at' at row 1 Warning 1265 Data truncated for column 'created_at' at row 1 +SET sql_mode = DEFAULT; +INSERT INTO diaries (title, created_at) VALUES ('2012', '2012'); +ERROR 22007: Incorrect datetime value: '2012' for column 'created_at' at row 1 SELECT * FROM diaries; id title created_at 1 2012 0000-01-01 00:00:00 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_zero_date.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_zero_date.result index c22a63f9744..4e05f0a2c52 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_zero_date.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_zero_date.result @@ -10,12 +10,14 @@ timestamps CREATE TABLE `timestamps` ( `create_dt` datetime DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 +SET sql_mode=''; INSERT INTO timestamps (create_dt) VALUES ("2012-00-01 00:00:00"); Warnings: Warning 1265 Data truncated for column 'create_dt' at row 1 INSERT INTO timestamps (create_dt) VALUES ("2012-01-00 00:00:00"); Warnings: Warning 1265 Data truncated for column 'create_dt' at row 1 +SET sql_mode = DEFAULT; SELECT * FROM timestamps; id create_dt 1 2012-01-01 00:00:00 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_fractional_seconds_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_fractional_seconds_with_index.result index cd75598a7ee..e9e12878fc9 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_fractional_seconds_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_fractional_seconds_with_index.result @@ -1,4 +1,5 @@ DROP TABLE IF EXISTS diaries; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE diaries ( id INT PRIMARY KEY AUTO_INCREMENT, title TEXT, @@ -6,6 +7,7 @@ created_at TIMESTAMP(6), updated_at TIMESTAMP(6), KEY (updated_at) ) DEFAULT CHARSET UTF8; +SET sql_mode = DEFAULT; SHOW CREATE TABLE diaries; Table Create Table diaries CREATE TABLE `diaries` ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_with_index.result index 3f93ce03ca6..82e62c27f32 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_timestamp_with_index.result @@ -1,4 +1,5 @@ DROP TABLE IF EXISTS diaries; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE diaries ( id INT PRIMARY KEY AUTO_INCREMENT, title TEXT, @@ -6,6 +7,7 @@ created_at TIMESTAMP, updated_at TIMESTAMP, KEY (updated_at) ) DEFAULT CHARSET UTF8; +SET sql_mode = DEFAULT; SHOW CREATE TABLE diaries; Table Create Table diaries CREATE TABLE `diaries` ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/geometry_bulk_insert_null.result b/storage/mroonga/mysql-test/mroonga/storage/r/geometry_bulk_insert_null.result index 5e831860c5e..fc16c590dc0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/geometry_bulk_insert_null.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/geometry_bulk_insert_null.result @@ -2,7 +2,7 @@ DROP TABLE IF EXISTS shops; CREATE TABLE shops ( location GEOMETRY NOT NULL ); -INSERT INTO shops VALUES (NULL), (NULL); +INSERT IGNORE INTO shops VALUES (NULL), (NULL); Warnings: Warning 1048 Column 'location' cannot be null Warning 1048 Column 'location' cannot be null diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_id_primary.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_id_primary.result index 508ee135ef2..b27c0ee028c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_id_primary.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_id_primary.result @@ -2,16 +2,16 @@ drop table if exists t1, t2, t3; create table t1 (_id int, a int, primary key (_id) using hash); insert into t1 values(null, 100); ERROR 23000: Column '_id' cannot be null -insert into t1 values(1,100); +insert ignore into t1 values(1,100); Warnings: Warning 1265 Data truncated for column '_id' at row 1 -insert into t1 values(1,100); +insert ignore into t1 values(1,100); Warnings: Warning 1265 Data truncated for column '_id' at row 1 -insert into t1 values(1,100); +insert ignore into t1 values(1,100); Warnings: Warning 1265 Data truncated for column '_id' at row 1 -insert into t1 values(1,100); +insert ignore into t1 values(1,100); Warnings: Warning 1265 Data truncated for column '_id' at row 1 select * from t1; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_update.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_update.result index 86b06bc94dd..ff2f975f94f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_update.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_update.result @@ -22,7 +22,7 @@ Jiro Yamada 27 Taro Yamada -12 Taro Yamada 10 Taro Yamada 29 -update scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27; +update ignore scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27; Warnings: Warning 1265 data truncated for primary key column: <name> select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.result index 155faf85510..d0325c47933 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.result @@ -5,6 +5,7 @@ start datetime, end datetime, UNIQUE KEY range_key(start, end) ); +SET sql_mode = ''; INSERT INTO ranges VALUES (1, "1990-00-00 00:00:00", "2012-10-05 23:59:59"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 @@ -18,4 +19,5 @@ Warning 1265 Data truncated for column 'start' at row 1 SELECT * FROM ranges; id start end 1 1990-01-01 00:00:00 2012-10-05 23:59:59 +SET sql_mode = DEFAULT; DROP TABLE ranges; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_index_read.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_index_read.result index d833fb44024..7c993eb564e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_index_read.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_index_read.result @@ -1,10 +1,12 @@ DROP TABLE IF EXISTS ranges; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2038-01-18 15:14:07"); INSERT INTO ranges VALUES (3, "2012-10-25 16:18:29", "2038-01-18 15:14:07"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_asc.result index 1e4ee102c9e..a040ab1ed0e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_asc.result @@ -1,10 +1,12 @@ DROP TABLE IF EXISTS ranges; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2012-10-25 16:18:29", "2038-01-18 15:14:07"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); INSERT INTO ranges VALUES (3, "2038-01-18 15:14:07", "1970-01-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_desc.result index 23a5522320a..27f2ce3c9a8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_order_desc.result @@ -1,10 +1,12 @@ DROP TABLE IF EXISTS ranges; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2012-10-25 16:18:29", "2038-01-18 15:14:07"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); INSERT INTO ranges VALUES (3, "2038-01-18 15:14:07", "1970-01-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_reinsert.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_reinsert.result index 3f3277f5e64..0494044adea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_reinsert.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_timestamp_reinsert.result @@ -1,10 +1,12 @@ DROP TABLE IF EXISTS ranges; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2010-01-01 00:00:00", "2012-10-05 23:59:59"); SELECT * FROM ranges; id start end diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_change_column_rename_multiple.test b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_change_column_rename_multiple.test index a9bbe403da1..ee25b482daa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_change_column_rename_multiple.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/alter_table_change_column_rename_multiple.test @@ -34,7 +34,7 @@ ALTER TABLE diaries CHANGE id internal_id INT; SHOW CREATE TABLE diaries; -INSERT INTO diaries (subject, description) +INSERT IGNORE INTO diaries (subject, description) VALUES ("groonga (1)", "starting groonga."); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_date_zero_date.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_date_zero_date.test index b6225075959..1df98cc1830 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_date_zero_date.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_date_zero_date.test @@ -26,8 +26,14 @@ CREATE TABLE timestamps ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE timestamps; +SET sql_mode = ''; INSERT INTO timestamps (create_dt) VALUES ("2012-00-01"); INSERT INTO timestamps (create_dt) VALUES ("2012-01-00"); +SET sql_mode = DEFAULT; +--error ER_TRUNCATED_WRONG_VALUE +INSERT INTO timestamps (create_dt) VALUES ("2012-00-01"); +--error ER_TRUNCATED_WRONG_VALUE +INSERT INTO timestamps (create_dt) VALUES ("2012-01-00"); SELECT * FROM timestamps; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_64bit_version_56_or_later_out_of_range.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_64bit_version_56_or_later_out_of_range.test index 18b501178bc..243512fd2ae 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_64bit_version_56_or_later_out_of_range.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_64bit_version_56_or_later_out_of_range.test @@ -32,8 +32,11 @@ CREATE TABLE diaries ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE diaries; -INSERT INTO diaries (title, created_at) - VALUES ('2012', '2012'); +SET sql_mode = ''; +INSERT INTO diaries (title, created_at) VALUES ('2012', '2012'); +SET sql_mode = DEFAULT; +--error ER_TRUNCATED_WRONG_VALUE +INSERT INTO diaries (title, created_at) VALUES ('2012', '2012'); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_zero_date.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_zero_date.test index 5c39086d452..c41344cf655 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_zero_date.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_zero_date.test @@ -26,8 +26,10 @@ CREATE TABLE timestamps ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE timestamps; +SET sql_mode=''; INSERT INTO timestamps (create_dt) VALUES ("2012-00-01 00:00:00"); INSERT INTO timestamps (create_dt) VALUES ("2012-01-00 00:00:00"); +SET sql_mode = DEFAULT; SELECT * FROM timestamps; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_fractional_seconds_with_index.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_fractional_seconds_with_index.test index 6f5e0116eb7..e9398534d88 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_fractional_seconds_with_index.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_fractional_seconds_with_index.test @@ -22,6 +22,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE diaries ( id INT PRIMARY KEY AUTO_INCREMENT, title TEXT, @@ -29,6 +30,7 @@ CREATE TABLE diaries ( updated_at TIMESTAMP(6), KEY (updated_at) ) DEFAULT CHARSET UTF8; +SET sql_mode = DEFAULT; SHOW CREATE TABLE diaries; INSERT INTO diaries (title, created_at, updated_at) diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_with_index.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_with_index.test index ae78befc466..9cd5aefc4c1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_with_index.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_timestamp_with_index.test @@ -20,6 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE diaries ( id INT PRIMARY KEY AUTO_INCREMENT, title TEXT, @@ -27,6 +28,7 @@ CREATE TABLE diaries ( updated_at TIMESTAMP, KEY (updated_at) ) DEFAULT CHARSET UTF8; +SET sql_mode = DEFAULT; SHOW CREATE TABLE diaries; INSERT INTO diaries (title, created_at, updated_at) diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/geometry_bulk_insert_null.test b/storage/mroonga/mysql-test/mroonga/storage/t/geometry_bulk_insert_null.test index a5f42e2c9f3..dc9ac4319ce 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/geometry_bulk_insert_null.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/geometry_bulk_insert_null.test @@ -27,7 +27,7 @@ CREATE TABLE shops ( location GEOMETRY NOT NULL ); -INSERT INTO shops VALUES (NULL), (NULL); +INSERT IGNORE INTO shops VALUES (NULL), (NULL); SELECT ST_AsText(location) FROM shops; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_hash_id_primary.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_hash_id_primary.test index 60ca970aa45..6aa4e04f7c8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_hash_id_primary.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_hash_id_primary.test @@ -23,10 +23,10 @@ drop table if exists t1, t2, t3; create table t1 (_id int, a int, primary key (_id) using hash); --error ER_BAD_NULL_ERROR insert into t1 values(null, 100); -insert into t1 values(1,100); -insert into t1 values(1,100); -insert into t1 values(1,100); -insert into t1 values(1,100); +insert ignore into t1 values(1,100); +insert ignore into t1 values(1,100); +insert ignore into t1 values(1,100); +insert ignore into t1 values(1,100); select * from t1; select * from t1 where _id = 2; select * from t1 where _id = 20; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_primary_update.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_primary_update.test index 26c76dd5207..c0f1e78552a 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_primary_update.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_primary_update.test @@ -32,7 +32,7 @@ insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); insert into scores (name, score) values("Taro Yamada", 10); select * from scores; -update scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27; +update ignore scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27; select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29); drop table scores; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.test index 2782fc15363..031edd6d289 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_datetime_insert_delete_insert_invalid_value.test @@ -27,12 +27,14 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); +SET sql_mode = ''; INSERT INTO ranges VALUES (1, "1990-00-00 00:00:00", "2012-10-05 23:59:59"); SELECT * FROM ranges; DELETE FROM ranges WHERE id = 1; INSERT INTO ranges VALUES (1, "1990-00-00 00:00:00", "2012-10-05 23:59:59"); SELECT * FROM ranges; +SET sql_mode = DEFAULT; DROP TABLE ranges; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_index_read.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_index_read.test index c660f6aef6e..58f30ad5dcf 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_index_read.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_index_read.test @@ -21,12 +21,14 @@ DROP TABLE IF EXISTS ranges; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2038-01-18 15:14:07"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_asc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_asc.test index 5ec630b56df..af30c1829cb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_asc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_asc.test @@ -22,12 +22,14 @@ DROP TABLE IF EXISTS ranges; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2012-10-25 16:18:29", "2038-01-18 15:14:07"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_desc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_desc.test index 9ca7440da88..eefa7cf70cd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_desc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_order_desc.test @@ -22,12 +22,14 @@ DROP TABLE IF EXISTS ranges; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2012-10-25 16:18:29", "2038-01-18 15:14:07"); INSERT INTO ranges VALUES (2, "1970-01-01 12:00:00", "2012-10-05 16:18:29"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_reinsert.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_reinsert.test index 559cf958804..ea4dd65c5bf 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_reinsert.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_timestamp_reinsert.test @@ -21,12 +21,14 @@ DROP TABLE IF EXISTS ranges; --enable_warnings +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE ranges ( id int PRIMARY KEY, start timestamp, end timestamp, UNIQUE KEY range_key(start, end) ); +SET sql_mode = DEFAULT; INSERT INTO ranges VALUES (1, "2010-01-01 00:00:00", "2012-10-05 23:59:59"); SELECT * FROM ranges; diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result index 58291bc7fd1..402e4068731 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result @@ -191,11 +191,11 @@ INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char'; INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10: binary data'; INSERT into t31 set f1=1, f2=1, f3=1, f4='first'; -INSERT into t31 set f1=1, f2=1, f3=2, f4='second', +INSERT ignore into t31 set f1=1, f2=1, f3=2, f4='second', f9=2.2, f10='seven samurai', f28=222.222, f35='222'; Warnings: Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1 -INSERT into t31 values (1, 1, 3, 'third', +INSERT ignore into t31 values (1, 1, 3, 'third', /* f5 BIGINT, */ 333333333333333333333333, /* f6 BLOB, */ '3333333333333333333333', /* f7 DATE, */ '2007-07-18', @@ -231,7 +231,7 @@ INSERT into t31 values (1, 1, 3, 'third', Warnings: Warning 1264 Out of range value for column 'f5' at row 1 Warning 1264 Out of range value for column 'f24' at row 1 -INSERT into t31 values (1, 1, 4, 'fourth', +INSERT ignore into t31 values (1, 1, 4, 'fourth', /* f5 BIGINT, */ 333333333333333333333333, /* f6 BLOB, */ '3333333333333333333333', /* f7 DATE, */ '2007-07-18', @@ -409,7 +409,7 @@ connection master; update t31 set f5=555555555555555 where f3=6; update t31 set f2=2 where f3=2; update t31 set f1=NULL where f3=1; -update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; +update ignore t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; Warnings: Warning 1048 Column 'f3' cannot be null diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result index 6caa51128f9..b2142e25796 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_slave_tokudb.result @@ -199,10 +199,12 @@ connection slave; *** Create t7 on slave *** STOP SLAVE; RESET SLAVE; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t7 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e CHAR(20) DEFAULT 'Extra Column Testing') ENGINE='TokuDB'; +SET sql_mode = DEFAULT; *** Create t7 on Master *** connection master; CREATE TABLE t7 (a INT PRIMARY KEY, b BLOB, c CHAR(5) @@ -235,9 +237,11 @@ connection slave; *** Create t8 on slave *** STOP SLAVE; RESET SLAVE; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t8 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e INT)ENGINE='TokuDB'; +SET sql_mode = DEFAULT; *** Create t8 on Master *** connection master; CREATE TABLE t8 (a INT PRIMARY KEY, b BLOB, c CHAR(5) diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result index 66aaaa6b6fa..e7240afd790 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_not_null_tokudb.result @@ -19,11 +19,15 @@ CREATE TABLE t1(`a` INT, `b` DATE DEFAULT NULL, PRIMARY KEY(`a`)) ENGINE=TokuDB DEFAULT CHARSET=LATIN1; CREATE TABLE t2(`a` INT, `b` DATE DEFAULT NULL, PRIMARY KEY(`a`)) ENGINE=TokuDB DEFAULT CHARSET=LATIN1; +set sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t3(`a` INT, `b` DATE DEFAULT '0000-00-00', `c` INT DEFAULT 500, PRIMARY KEY(`a`)) ENGINE=TokuDB DEFAULT CHARSET=LATIN1; +set sql_mode = DEFAULT; +set sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t4(`a` INT, `b` DATE DEFAULT '0000-00-00', PRIMARY KEY(`a`)) ENGINE=TokuDB DEFAULT CHARSET=LATIN1; +set sql_mode = DEFAULT; ************* EXECUTION WITH INSERTS ************* connection master; INSERT INTO t1(a,b,c) VALUES (1, null, 1); diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result index aa3c1ce50b9..1ebe6ba940b 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_row_basic_3tokudb.result @@ -617,6 +617,7 @@ KEY `datetime_key` (`datetime_key`), KEY `varchar_key` (`varchar_key`) ) ENGINE='TokuDB'; INSERT INTO t1 VALUES (1,8,5,'0000-00-00','0000-00-00','10:37:38','10:37:38','0000-00-00 00:00:00','0000-00-00 00:00:00','p','p'),(2,0,9,'0000-00-00','0000-00-00','00:00:00','00:00:00','2007-10-14 00:00:00','2007-10-14 00:00:00','d','d'); +ERROR 22007: Incorrect date value: '0000-00-00' for column 'date_key' at row 1 CREATE TABLE t2 ( `pk` int(11) NOT NULL AUTO_INCREMENT, `int_nokey` int(11) NOT NULL, @@ -637,6 +638,7 @@ KEY `datetime_key` (`datetime_key`), KEY `varchar_key` (`varchar_key`) ) ENGINE='TokuDB'; INSERT INTO t2 VALUES (1,1,6,'2005-12-23','2005-12-23','02:24:28','02:24:28','0000-00-00 00:00:00','0000-00-00 00:00:00','g','g'),(2,0,3,'2009-09-14','2009-09-14','00:00:00','00:00:00','2000-01-30 16:39:40','2000-01-30 16:39:40','q','q'),(3,0,3,'0000-00-00','0000-00-00','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','c','c'),(4,1,6,'2007-03-29','2007-03-29','15:49:00','15:49:00','0000-00-00 00:00:00','0000-00-00 00:00:00','m','m'),(5,4,0,'2002-12-04','2002-12-04','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','o','o'),(6,9,0,'2005-01-28','2005-01-28','00:00:00','00:00:00','2001-05-18 00:00:00','2001-05-18 00:00:00','w','w'),(7,6,0,'0000-00-00','0000-00-00','06:57:25','06:57:25','0000-00-00 00:00:00','0000-00-00 00:00:00','m','m'),(8,0,0,'0000-00-00','0000-00-00','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','z','z'),(9,4,6,'2006-08-15','2006-08-15','00:00:00','00:00:00','2002-04-12 14:44:25','2002-04-12 14:44:25','j','j'),(10,0,5,'2006-12-20','2006-12-20','10:13:53','10:13:53','2008-07-22 00:00:00','2008-07-22 00:00:00','y','y'),(11,9,7,'0000-00-00','0000-00-00','00:00:00','00:00:00','2004-07-05 00:00:00','2004-07-05 00:00:00','{','{'),(12,4,3,'2007-01-26','2007-01-26','23:00:51','23:00:51','2001-05-16 00:00:00','2001-05-16 00:00:00','f','f'),(13,7,0,'2004-03-27','2004-03-27','00:00:00','00:00:00','2005-01-24 03:30:37','2005-01-24 03:30:37','',''),(14,6,0,'2006-07-26','2006-07-26','18:43:57','18:43:57','0000-00-00 00:00:00','0000-00-00 00:00:00','{','{'),(15,0,6,'2000-01-14','2000-01-14','00:00:00','00:00:00','2000-09-21 00:00:00','2000-09-21 00:00:00','o','o'),(16,9,8,'0000-00-00','0000-00-00','21:15:08','21:15:08','0000-00-00 00:00:00','0000-00-00 00:00:00','a','a'),(17,2,0,'2004-10-27','2004-10-27','00:00:00','00:00:00','2004-03-24 22:13:43','2004-03-24 22:13:43','',''),(18,7,4,'0000-00-00','0000-00-00','08:38:27','08:38:27','2002-03-18 19:51:44','2002-03-18 19:51:44','t','t'),(19,5,3,'2008-03-07','2008-03-07','03:29:07','03:29:07','2007-12-01 18:44:44','2007-12-01 18:44:44','t','t'),(20,0,0,'2002-04-09','2002-04-09','16:06:03','16:06:03','2009-04-22 00:00:00','2009-04-22 00:00:00','n','n'); +ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'datetime_key' at row 1 DELETE FROM t2 WHERE `int_key` < 3 LIMIT 1; UPDATE t1 SET `int_key` = 3 ORDER BY `pk` LIMIT 4; DELETE FROM t2 WHERE `int_key` < 3 LIMIT 1; @@ -644,7 +646,6 @@ DELETE FROM t2 WHERE `pk` < 6 LIMIT 1; UPDATE t1 SET `int_key` = 6 ORDER BY `pk` LIMIT 3; DELETE FROM t2 WHERE `pk` < 6 LIMIT 1; UPDATE t1 SET `pk` = 6 ORDER BY `int_key` LIMIT 6; -ERROR 23000: Duplicate entry '6' for key 'PRIMARY' DELETE FROM t2 WHERE `pk` < 7 LIMIT 1; UPDATE t1 SET `int_key` = 4 ORDER BY `pk` LIMIT 6; connection slave; @@ -681,33 +682,33 @@ CREATE TABLE t1 (a bit) ENGINE='TokuDB'; INSERT IGNORE INTO t1 VALUES (NULL); INSERT INTO t1 ( a ) VALUES ( 0 ); UPDATE t1 SET a = 0 WHERE a = 1 LIMIT 3; -INSERT INTO t1 ( a ) VALUES ( 5 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 5 ); DELETE FROM t1 WHERE a < 2 LIMIT 4; DELETE FROM t1 WHERE a < 9 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 9 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 9 ); UPDATE t1 SET a = 8 WHERE a = 0 LIMIT 6; -INSERT INTO t1 ( a ) VALUES ( 8 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 8 ); UPDATE t1 SET a = 0 WHERE a < 6 LIMIT 0; -INSERT INTO t1 ( a ) VALUES ( 4 ); -INSERT INTO t1 ( a ) VALUES ( 3 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 4 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 3 ); UPDATE t1 SET a = 0 WHERE a = 7 LIMIT 6; DELETE FROM t1 WHERE a = 4 LIMIT 7; -UPDATE t1 SET a = 9 WHERE a < 2 LIMIT 9; +UPDATE IGNORE t1 SET a = 9 WHERE a < 2 LIMIT 9; UPDATE t1 SET a = 0 WHERE a < 9 LIMIT 2; DELETE FROM t1 WHERE a < 0 LIMIT 5; -INSERT INTO t1 ( a ) VALUES ( 5 ); -UPDATE t1 SET a = 4 WHERE a < 6 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 5 ); -UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 8; +INSERT IGNORE INTO t1 ( a ) VALUES ( 5 ); +UPDATE IGNORE t1 SET a = 4 WHERE a < 6 LIMIT 4; +INSERT IGNORE INTO t1 ( a ) VALUES ( 5 ); +UPDATE IGNORE t1 SET a = 9 WHERE a < 5 LIMIT 8; DELETE FROM t1 WHERE a < 8 LIMIT 8; -INSERT INTO t1 ( a ) VALUES ( 6 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 6 ); DELETE FROM t1 WHERE a < 6 LIMIT 7; UPDATE t1 SET a = 7 WHERE a = 3 LIMIT 7; UPDATE t1 SET a = 8 WHERE a = 0 LIMIT 6; -INSERT INTO t1 ( a ) VALUES ( 7 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 7 ); DELETE FROM t1 WHERE a < 9 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 7 ); -INSERT INTO t1 ( a ) VALUES ( 6 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 7 ); +INSERT IGNORE INTO t1 ( a ) VALUES ( 6 ); UPDATE t1 SET a = 8 WHERE a = 3 LIMIT 4; DELETE FROM t1 WHERE a = 2 LIMIT 9; DELETE FROM t1 WHERE a = 1 LIMIT 4; @@ -716,7 +717,7 @@ INSERT INTO t1 ( a ) VALUES ( 0 ); DELETE FROM t1 WHERE a < 3 LIMIT 0; UPDATE t1 SET a = 8 WHERE a = 5 LIMIT 2; INSERT INTO t1 ( a ) VALUES ( 1 ); -UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3; +UPDATE IGNORE t1 SET a = 9 WHERE a < 5 LIMIT 3; connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions; include/diff_tables.inc [master:t1, slave:t1] diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result index b4b3fffc696..df1fe125aa4 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_row_rec_comp_tokudb.result @@ -6,7 +6,7 @@ connection master; CREATE TABLE t1 (c1 bigint(20) DEFAULT 0, c2 bigint(20) DEFAULT 0, c3 bigint(20) DEFAULT 0, c4 varchar(1) DEFAULT '', c5 bigint(20) DEFAULT 0, c6 bigint(20) DEFAULT 0, c7 bigint(20) DEFAULT 0, c8 bigint(20) DEFAULT 0) ENGINE=TokuDB DEFAULT CHARSET=latin1; INSERT INTO t1 ( c5, c6 ) VALUES ( 1 , 35 ); INSERT INTO t1 ( c5, c6 ) VALUES ( NULL, 35 ); -UPDATE t1 SET c5 = 'a'; +UPDATE IGNORE t1 SET c5 = 'a'; connection slave; include/diff_tables.inc [master:t1, slave:t1] connection master; @@ -19,7 +19,7 @@ connection master; CREATE TABLE t1 (c1 bigint(20) DEFAULT 0, c2 bigint(20) DEFAULT 0, c3 bigint(20) DEFAULT 0, c4 bigint(20) DEFAULT 0, c5 bigint(20) DEFAULT 0, c6 bigint(20) DEFAULT 0, c7 bigint(20) DEFAULT 0) ENGINE=TokuDB DEFAULT CHARSET=latin1; INSERT INTO t1 ( c5, c6 ) VALUES ( 1 , 35 ); INSERT INTO t1 ( c5, c6 ) VALUES ( NULL, 35 ); -UPDATE t1 SET c5 = 'a'; +UPDATE IGNORE t1 SET c5 = 'a'; connection slave; include/diff_tables.inc [master:t1, slave:t1] connection master; diff --git a/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result index 3efeb757b61..2dae25d4aa4 100644 --- a/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result +++ b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result @@ -60,7 +60,7 @@ want1result location DROP TABLE t1; create table t1 (a set('a') not null); -insert into t1 values (),(); +insert ignore into t1 values (),(); Warnings: Warning 1364 Field 'a' doesn't have a default value select cast(a as char(1)) from t1; @@ -162,7 +162,7 @@ want1result location DROP TABLE t1; create table t1 (a set('a') not null); -insert into t1 values (),(); +insert ignore into t1 values (),(); Warnings: Warning 1364 Field 'a' doesn't have a default value select cast(a as char(1)) from t1; 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 21bfb990ba9..5385dcf9d64 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 @@ -49,9 +49,11 @@ 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 XYZ version set tokudb_disable_hot_alter=1; set tokudb_disable_slow_alter=0; +set sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4'); Warnings: Warning 1265 Data truncated for column 'col2' at row 3 +set sql_mode = DEFAULT; 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 9e1504a9d89..56e979bda50 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 @@ -38,9 +38,11 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; Warnings: Warning 1265 Data truncated for column 'c19' at row 1 +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 45a12fba8d2..14525a1a426 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 @@ -38,9 +38,11 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; Warnings: Warning 1265 Data truncated for column 'c19' at row 1 +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 d5ff7e092fe..a44e2765355 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 @@ -38,9 +38,11 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; Warnings: Warning 1265 Data truncated for column 'c19' at row 1 +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 09b0deaf990..f05256b1b3d 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 @@ -38,9 +38,11 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; Warnings: Warning 1265 Data truncated for column 'c19' at row 1 +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ADD KEY (c25); UPDATE t SET c27=0; 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 4efa3afd96e..0daf8f442fb 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 @@ -50,7 +50,9 @@ ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4'); set tokudb_disable_hot_alter=1; set tokudb_disable_slow_alter=0; +set sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE test_enum MODIFY COLUMN col2 ENUM('value1','value2','value4'); +set sql_mode = DEFAULT; SELECT * FROM test_enum; -drop table test_enum;
\ No newline at end of file +drop table test_enum; 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 70e2a07e4cc..b69b1bba53d 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 @@ -47,7 +47,9 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 048e39dc757..3aa0d8cb19b 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 @@ -47,7 +47,9 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 a5695e8a4c6..9ac6ccf9343 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 @@ -47,7 +47,9 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; UPDATE t SET c27=0; 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 d2726c30ddd..c01d9df01d8 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 @@ -47,7 +47,9 @@ c31 date, key(c31)) ENGINE=tokudb; INSERT INTO t (c25) VALUES (NULL); UPDATE t SET c27=0; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; ALTER TABLE t ADD PRIMARY KEY(c19,c27)USING HASH; +SET sql_mode = DEFAULT; UPDATE t SET c27=0; ALTER TABLE t ADD KEY (c25); UPDATE t SET c27=0; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result b/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result index b2d393d4469..9a72e882b3c 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/6684.result @@ -11,12 +11,14 @@ CREATE TABLE `site` ( PRIMARY KEY (`id`), KEY `owner_title` (`title`) ) ENGINE=TokuDB AUTO_INCREMENT=575 DEFAULT CHARSET=utf8; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE `screenshot` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `site` int(11) unsigned NOT NULL, `timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=TokuDB AUTO_INCREMENT=82720 DEFAULT CHARSET=utf8; +SET sql_mode = DEFAULT; INSERT INTO `site` (`id`, `title`) VALUES (9, 'Facebook'), @@ -38,7 +40,9 @@ WHERE screenshot.id IS NULL; id title id site timestamp SELECT * FROM site where site.id not in (select screenshot.site from screenshot where timestamp > '2013-04-28 13:30:00'); id title +set sql_mode = ''; create index `site` on screenshot(`site`); +set sql_mode = default; SELECT * FROM site LEFT JOIN screenshot diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result index e8765ec7ab9..03bcc13efc2 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/alter_table_copy_table.result @@ -3,6 +3,8 @@ set tokudb_disable_hot_alter=ON; set default_storage_engine=tokudb; create table t (id int, x char(2), primary key (id), unique key (x)); insert into t values (1,'aa'),(2,'ab'); +set sql_mode = ''; alter table t modify x char(1); ERROR 23000: Duplicate entry 'a' for key 'x' +set sql_mode = default; drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result index c8565fb4b2b..600deeae7c6 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result @@ -12,9 +12,11 @@ ts timestamp not null default now()); insert into t1 (col1,col2) values (0,0); insert into t1_audit (col1,action) values (0,'DUMMY'); set local tokudb_prelock_empty=0; +set sql_mode = ''; create trigger t1_trigger before delete on t1 for each row insert into t1_audit (col1, action) values (old.col1, 'BEFORE DELETE'); +set sql_mode = default; insert into t1 (col1,col2) values (1,1); start transaction; delete from t1 where col1 = 1; @@ -32,9 +34,11 @@ locks_dname locks_key_left locks_key_right ./test/t1_audit-main 0200000000000000 0200000000000000 commit; drop trigger t1_trigger; +set sql_mode = ''; create trigger t1_trigger after delete on t1 for each row insert into t1_audit (col1, action) values (old.col1, 'AFTER DELETE'); +set sql_mode = default; insert into t1 (col1,col2) values (2,2); start transaction; delete from t1 where col1 = 2; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/db945.result b/storage/tokudb/mysql-test/tokudb_bugs/r/db945.result index 6b3c239d602..edebae3b9e0 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/db945.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/db945.result @@ -7,7 +7,7 @@ set session tokudb_analyze_throttle = 0; set session tokudb_analyze_time = 0; create table t1(a int, b text(1), c text(1), filler text(1), primary key(a, b(1)), unique key (a, c(1))); lock tables t1 write, t1 as a read, t1 as b read; -insert into t1(a) values(1); +insert ignore into t1(a) values(1); Warnings: Warning 1364 Field 'b' doesn't have a default value alter table t1 drop key a; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result b/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result index fa98811c803..e3991b42a06 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/leak172.result @@ -1,5 +1,6 @@ set default_storage_engine=tokudb; drop table if exists t1,t2; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE `t1` ( `c4` int(11) DEFAULT NULL, `c5` int(11) DEFAULT NULL, @@ -118,6 +119,7 @@ KEY `c31` (`c31`) ); LOAD DATA INFILE 'leak172_t1.data' INTO TABLE `t1` fields terminated by ','; connect conn1,localhost,root,,; +set sql_mode = ''; set session debug_dbug="+d,tokudb_end_bulk_insert_sleep"; LOAD DATA INFILE 'leak172_t2.data' INTO TABLE `t2` fields terminated by ','; connection default; @@ -127,3 +129,4 @@ connection conn1; connection default; disconnect conn1; drop table t1,t2; +set sql_mode = default; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test b/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test index 63ddf752512..a5a434de23c 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/6684.test @@ -11,12 +11,14 @@ CREATE TABLE `site` ( KEY `owner_title` (`title`) ) ENGINE=TokuDB AUTO_INCREMENT=575 DEFAULT CHARSET=utf8; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE `screenshot` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `site` int(11) unsigned NOT NULL, `timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=TokuDB AUTO_INCREMENT=82720 DEFAULT CHARSET=utf8; +SET sql_mode = DEFAULT; INSERT INTO `site` (`id`, `title`) VALUES @@ -44,7 +46,9 @@ WHERE screenshot.id IS NULL; SELECT * FROM site where site.id not in (select screenshot.site from screenshot where timestamp > '2013-04-28 13:30:00'); # adding either of these two indexes causes the SQL to return an incorrect rowset (1 rows instead of 0 rows) - create index `site` on screenshot(`site`); +set sql_mode = ''; +create index `site` on screenshot(`site`); +set sql_mode = default; # this query is wrong when one or both of the above indexes is added SELECT * @@ -55,4 +59,4 @@ LEFT JOIN screenshot WHERE screenshot.id IS NULL; drop table site; -drop table screenshot;
\ No newline at end of file +drop table screenshot; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test index 6e4433183b0..def1ffe366e 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test @@ -7,6 +7,8 @@ set tokudb_disable_hot_alter=ON; set default_storage_engine=tokudb; create table t (id int, x char(2), primary key (id), unique key (x)); insert into t values (1,'aa'),(2,'ab'); +set sql_mode = ''; --error 1062 alter table t modify x char(1); -drop table t;
\ No newline at end of file +set sql_mode = default; +drop table t; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test index 79043664607..65ba30624ab 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test @@ -20,9 +20,11 @@ insert into t1 (col1,col2) values (0,0); insert into t1_audit (col1,action) values (0,'DUMMY'); set local tokudb_prelock_empty=0; +set sql_mode = ''; create trigger t1_trigger before delete on t1 for each row insert into t1_audit (col1, action) values (old.col1, 'BEFORE DELETE'); +set sql_mode = default; insert into t1 (col1,col2) values (1,1); start transaction; delete from t1 where col1 = 1; @@ -33,9 +35,11 @@ select locks_dname,locks_key_left,locks_key_right from information_schema.tokudb commit; drop trigger t1_trigger; +set sql_mode = ''; create trigger t1_trigger after delete on t1 for each row insert into t1_audit (col1, action) values (old.col1, 'AFTER DELETE'); +set sql_mode = default; insert into t1 (col1,col2) values (2,2); start transaction; delete from t1 where col1 = 2; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test index 27b0d284484..c7774877291 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test @@ -12,7 +12,7 @@ set session tokudb_analyze_time = 0; create table t1(a int, b text(1), c text(1), filler text(1), primary key(a, b(1)), unique key (a, c(1))); lock tables t1 write, t1 as a read, t1 as b read; -insert into t1(a) values(1); +insert ignore into t1(a) values(1); alter table t1 drop key a; unlock tables; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test b/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test index 9d82604e4b1..f2e31ad8670 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/leak172.test @@ -13,6 +13,7 @@ let $MYSQLD_DATADIR=`select @@datadir`; copy_file $MTR_SUITE_DIR/std_data/leak172_t1.data $MYSQLD_DATADIR/test/leak172_t1.data; copy_file $MTR_SUITE_DIR/std_data/leak172_t2.data $MYSQLD_DATADIR/test/leak172_t2.data; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE `t1` ( `c4` int(11) DEFAULT NULL, `c5` int(11) DEFAULT NULL, @@ -134,6 +135,7 @@ CREATE TABLE `t2` ( LOAD DATA INFILE 'leak172_t1.data' INTO TABLE `t1` fields terminated by ','; connect(conn1,localhost,root,,); +set sql_mode = ''; set session debug_dbug="+d,tokudb_end_bulk_insert_sleep"; send LOAD DATA INFILE 'leak172_t2.data' INTO TABLE `t2` fields terminated by ','; @@ -150,3 +152,4 @@ connection default; disconnect conn1; drop table t1,t2; +set sql_mode = default; |