diff options
Diffstat (limited to 'storage/mroonga/mysql-test/mroonga/storage/r')
14 files changed, 34 insertions, 9 deletions
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 |