summaryrefslogtreecommitdiff
path: root/mysql-test/t/ctype_many.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-02-08 15:28:00 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-02-10 06:30:42 -0500
commit8b2e642aa214db729161252b96f36bfbae3add21 (patch)
tree006dcc588623c7c7ee508eca3534259f62244f2c /mysql-test/t/ctype_many.test
parentf556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff)
downloadmariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'mysql-test/t/ctype_many.test')
-rw-r--r--mysql-test/t/ctype_many.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index a51ead67eb2..a619b16416c 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -175,6 +175,7 @@ SET CHARACTER SET utf8;
ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;
--disable_warnings
+SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
ALTER TABLE t1 CHANGE ucs2_f ucs2_f CHAR(32) UNICODE NOT NULL;
--enable_warnings
@@ -310,7 +311,7 @@ DROP TABLE t1;
CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf32);
CREATE TABLE t2 (a VARCHAR(10) CHARACTER SET ucs2);
INSERT INTO t1 VALUES (0x10082), (0x12345);
-INSERT INTO t2 SELECT * FROM t1;
+INSERT IGNORE INTO t2 SELECT * FROM t1;
SELECT HEX(a) FROM t2;
DROP TABLE t1;
DROP TABLE t2;