mysql57: support "STRICT_ALL_TABLES"

mroonga · Apr 21, 2016 · 07385be · 07385be
1 parent 2f5f296
commit 07385be
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -246,7 +246,7 @@
 #  define MRN_ABORT_ON_WARNING(thd) thd->abort_on_warning
 #else
 #  if MYSQL_VERSION_ID >= 50706
-#    define MRN_ABORT_ON_WARNING(thd) false
+#    define MRN_ABORT_ON_WARNING(thd) thd->is_strict_mode()
 #  else
 #    define MRN_ABORT_ON_WARNING(thd) thd->abort_on_warning
 #  endif

diff --git a/mysql-test/mroonga/storage/index/hash/mysql_57_or_later/r/id_primary.result b/mysql-test/mroonga/storage/index/hash/mysql_57_or_later/r/id_primary.result
@@ -12,13 +12,8 @@ INSERT INTO t1 VALUES(1,100);
 ERROR 01000: Data truncated for column '_id' at row 1
 SELECT * FROM t1;
 _id	a
-1	100
-2	100
-3	100
-4	100
 SELECT * FROM t1 WHERE _id = 2;
 _id	a
-2	100
 SELECT * FROM t1 WHERE _id = 20;
 _id	a
 DROP TABLE t1;