summaryrefslogtreecommitdiff
path: root/mysql-test/t/join.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
commita3a91332d006fd39a32e1f6d4663e11515ea944b (patch)
tree560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/t/join.test
parent2805baf06c31dac21604148ec089300461790e3d (diff)
downloadmariadb-git-bb-10.2-mdev7635.saved.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_modebb-10.2-mdev7635.savedbb-10.2-mdev7635.final
Diffstat (limited to 'mysql-test/t/join.test')
-rw-r--r--mysql-test/t/join.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index e07a3665920..91583f947ba 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -65,6 +65,7 @@ drop table t1,t2;
# problem with join
#
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
CREATE TABLE t1 (
id int(11) NOT NULL auto_increment,
token varchar(100) DEFAULT '' NOT NULL,
@@ -77,6 +78,7 @@ CREATE TABLE t1 (
KEY timestamp (timestamp),
UNIQUE token_2 (token(75),count,phone)
);
+SET sql_mode = DEFAULT;
INSERT INTO t1 VALUES (21,'e45703b64de71482360de8fec94c3ade',3,7800,'n','1999-12-23 17:22:21');
INSERT INTO t1 VALUES (22,'e45703b64de71482360de8fec94c3ade',4,5000,'y','1999-12-23 17:22:21');