diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-09 20:42:05 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-09 20:51:29 -0500 |
commit | 71a7c5bb69a0dac2dad255c1b1d30f7b0cd308dc (patch) | |
tree | fa16e6846088634c603f0bb3eba02c3022a65119 | |
parent | 2db09276366e451a68ec42508e1245fd2d817869 (diff) | |
download | mariadb-git-bb-10.2-mdev7635.tar.gz |
MDEV-7635: Fix for mroonga 32-bit test failures.bb-10.2-mdev7635
20 files changed, 56 insertions, 56 deletions
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_2038.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_2038.result index f7e0c7ed4e6..c5764cc110c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_2038.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_2038.result @@ -14,7 +14,7 @@ diaries CREATE TABLE `diaries` ( ) ENGINE=Mroonga DEFAULT CHARSET=utf8 INSERT INTO diaries (title, created_at) VALUES ('2038-01-18 03:14:07', '2038-01-18 03:14:07'); -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('2038-01-20 03:14:08', '2038-01-20 03:14:08'); Warnings: Warning 1265 Data truncated for column 'created_at' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_before_unix_epoch.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_before_unix_epoch.result index fa0c74686a4..a85d60af383 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_before_unix_epoch.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_before_unix_epoch.result @@ -12,7 +12,7 @@ diaries CREATE TABLE `diaries` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('1000-01-01 00:00:00', '1000-01-01 00:00:00'); Warnings: Warning 1265 Data truncated for column 'created_at' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_max.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_max.result index 45af052b8d4..71dfa08c762 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_max.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_max.result @@ -12,7 +12,7 @@ diaries CREATE TABLE `diaries` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('9999-12-31 23:59:59', '9999-12-31 23:59:59'); Warnings: Warning 1265 Data truncated for column 'created_at' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_out_of_range.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_out_of_range.result index bc91116f150..6044e24ad61 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_out_of_range.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_32bit_out_of_range.result @@ -12,7 +12,7 @@ diaries CREATE TABLE `diaries` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=Mroonga DEFAULT CHARSET=utf8 -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('2012', '2012'); Warnings: Warning 1265 Data truncated for column 'created_at' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_32bit_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_32bit_equal.result index 2174efc1b4f..61ce4406987 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_32bit_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_32bit_equal.result @@ -5,17 +5,17 @@ start DATE, end DATE, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (1, "1000-01-01", "2012-10-05"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (2, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (3, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (3, "2012-10-25", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (4, "9999-12-31", "1000-01-01"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_asc.result index 0a64a822fb5..bc1c3c57daa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_asc.result @@ -5,17 +5,17 @@ start DATE, end DATE, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_desc.result index 24439fdf5fa..820ee4f4465 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_date_order_32bit_desc.result @@ -5,17 +5,17 @@ start DATE, end DATE, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_32bit_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_32bit_equal.result index 04b3ba38395..ad936268b46 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_32bit_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_32bit_equal.result @@ -5,17 +5,17 @@ start YEAR, end YEAR, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (1, 1901, 2012); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (2, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2155); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (3, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (3, 2012, 2155); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (4, 2155, 1901); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_asc.result index 9a84d115a87..8200263a93c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_asc.result @@ -5,17 +5,17 @@ start YEAR, end YEAR, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (1, 2012, 2155); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (2, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2012); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (3, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (3, 2155, 1901); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (4, 1901, 2155); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_desc.result index 3deb7435030..fc85d2a98a1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_unique_year_order_32bit_desc.result @@ -5,17 +5,17 @@ start YEAR, end YEAR, UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (1, 2012, 2155); Warnings: Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (2, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2012); Warnings: Warning 1265 Data truncated for column 'start' at row 1 -INSERT INTO ranges VALUES (3, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (3, 2155, 1901); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 -INSERT INTO ranges VALUES (4, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (4, 1901, 2155); Warnings: Warning 1265 Data truncated for column 'start' at row 1 Warning 1265 Data truncated for column 'end' at row 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_2038.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_2038.test index 9c3344cbe98..023f4e8b0b7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_2038.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_2038.test @@ -30,7 +30,7 @@ SHOW CREATE TABLE diaries; INSERT INTO diaries (title, created_at) VALUES ('2038-01-18 03:14:07', '2038-01-18 03:14:07'); -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('2038-01-20 03:14:08', '2038-01-20 03:14:08'); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_before_unix_epoch.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_before_unix_epoch.test index 61eecbb2ac8..7e357067b54 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_before_unix_epoch.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_before_unix_epoch.test @@ -28,7 +28,7 @@ CREATE TABLE diaries ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE diaries; -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('1000-01-01 00:00:00', '1000-01-01 00:00:00'); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_max.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_max.test index 7bbfcbe7a3a..863bae8ecf1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_max.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_max.test @@ -28,7 +28,7 @@ CREATE TABLE diaries ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE diaries; -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('9999-12-31 23:59:59', '9999-12-31 23:59:59'); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_out_of_range.test b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_out_of_range.test index 2cc99562231..68ff4b664fa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_out_of_range.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/column_datetime_32bit_out_of_range.test @@ -28,7 +28,7 @@ CREATE TABLE diaries ( ) DEFAULT CHARSET UTF8; SHOW CREATE TABLE diaries; -INSERT INTO diaries (title, created_at) +INSERT IGNORE INTO diaries (title, created_at) VALUES ('2012', '2012'); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_32bit_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_32bit_equal.test index b206333d28d..66a0c463a34 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_32bit_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_32bit_equal.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "1000-01-01", "2012-10-05"); -INSERT INTO ranges VALUES (2, "1000-01-01", "9999-12-31"); -INSERT INTO ranges VALUES (3, "2012-10-25", "9999-12-31"); -INSERT INTO ranges VALUES (4, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (1, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (3, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (4, "9999-12-31", "1000-01-01"); SELECT * FROM ranges FORCE INDEX(range_key) WHERE start = "1000-01-01" AND end = "9999-12-31"; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_asc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_asc.test index b877ed2f01a..09306536da9 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_asc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_asc.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); -INSERT INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); -INSERT INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); -INSERT INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); SELECT * FROM ranges FORCE INDEX(range_key) ORDER BY start, end; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_desc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_desc.test index c3185bb0fdc..a3306fc776f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_desc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_date_order_32bit_desc.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); -INSERT INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); -INSERT INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); -INSERT INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (1, "2012-10-25", "9999-12-31"); +INSERT IGNORE INTO ranges VALUES (2, "1000-01-01", "2012-10-05"); +INSERT IGNORE INTO ranges VALUES (3, "9999-12-31", "1000-01-01"); +INSERT IGNORE INTO ranges VALUES (4, "1000-01-01", "9999-12-31"); SELECT * FROM ranges FORCE INDEX(range_key) ORDER BY start DESC, end DESC; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_32bit_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_32bit_equal.test index 3daf3fa4153..b09214d0037 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_32bit_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_32bit_equal.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 1901, 2012); -INSERT INTO ranges VALUES (2, 1901, 2155); -INSERT INTO ranges VALUES (3, 2012, 2155); -INSERT INTO ranges VALUES (4, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (1, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (3, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (4, 2155, 1901); SELECT * FROM ranges FORCE INDEX(range_key) WHERE start = 1901 AND end = 2155; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_asc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_asc.test index 774c06772a7..ffc00ddf1c1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_asc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_asc.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 2012, 2155); -INSERT INTO ranges VALUES (2, 1901, 2012); -INSERT INTO ranges VALUES (3, 2155, 1901); -INSERT INTO ranges VALUES (4, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (1, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (3, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (4, 1901, 2155); SELECT * FROM ranges FORCE INDEX(range_key) ORDER BY start, end; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_desc.test b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_desc.test index bd0d20fe973..c714f4424d6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_desc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/index_multiple_column_unique_year_order_32bit_desc.test @@ -29,10 +29,10 @@ CREATE TABLE ranges ( UNIQUE KEY range_key(start, end) ); -INSERT INTO ranges VALUES (1, 2012, 2155); -INSERT INTO ranges VALUES (2, 1901, 2012); -INSERT INTO ranges VALUES (3, 2155, 1901); -INSERT INTO ranges VALUES (4, 1901, 2155); +INSERT IGNORE INTO ranges VALUES (1, 2012, 2155); +INSERT IGNORE INTO ranges VALUES (2, 1901, 2012); +INSERT IGNORE INTO ranges VALUES (3, 2155, 1901); +INSERT IGNORE INTO ranges VALUES (4, 1901, 2155); SELECT * FROM ranges FORCE INDEX(range_key) ORDER BY start DESC, end DESC; |