diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-08-11 18:45:38 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
commit | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (patch) | |
tree | e02c8ac4c2a978aa12f1f9fdf19ec5303f7e9341 /mysql-test/r/delete_returning_grant.result | |
parent | 21daa7b9298d31ab1c6ddd1159dba29acea8d868 (diff) | |
download | mariadb-git-e3982cead235e9becb1abdbf0e73876c8a6e6b28.tar.gz |
MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)
Diffstat (limited to 'mysql-test/r/delete_returning_grant.result')
-rw-r--r-- | mysql-test/r/delete_returning_grant.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/delete_returning_grant.result b/mysql-test/r/delete_returning_grant.result index c15d3627a39..bdd171940ba 100644 --- a/mysql-test/r/delete_returning_grant.result +++ b/mysql-test/r/delete_returning_grant.result @@ -1,3 +1,5 @@ +set GLOBAL sql_mode=""; +set LOCAL sql_mode=""; CREATE TABLE t1 (a int(11), b varchar(32)); INSERT INTO t1 VALUES (7,'ggggggg'),(1,'a'),(3,'ccc'),(4,'dddd'),(1,'A'), (2,'BB'),(4,'DDDD'),(5,'EEEEE'),(7,'GGGGGGG'),(2,'bb'); @@ -67,3 +69,4 @@ DROP DATABASE mysqltest; DROP USER mysqltest_1@localhost; DROP VIEW v1; DROP TABLE t1; +set GLOBAL sql_mode=default; |