MDEV-7635: Fix for mroonga 32-bit test failures.

Nirbhay Choubey · Nirbhay Choubey · commit 6f42c3c5a4df · 2017-02-10T06:30:42.000-05:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
