summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant4.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
commit76d6ac448d18a9e97ce4be585d79607780e00a49 (patch)
tree4a469019460057da12977d7ee6817f3873ac607d /mysql-test/r/grant4.result
parentba230c21adcfc6e6a6174ff25d8a8aebd1a70f0a (diff)
downloadmariadb-git-bb-10.1-MDEV-6066.tar.gz
MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)bb-10.1-MDEV-6066
Diffstat (limited to 'mysql-test/r/grant4.result')
-rw-r--r--mysql-test/r/grant4.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/grant4.result b/mysql-test/r/grant4.result
index d96802d105c..5a0032cd338 100644
--- a/mysql-test/r/grant4.result
+++ b/mysql-test/r/grant4.result
@@ -1,4 +1,6 @@
drop database if exists mysqltest_db1;
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
create database mysqltest_db1;
use mysqltest_db1;
create table t_column_priv_only (a int, b int);
@@ -212,3 +214,4 @@ create user foo3 identified via mysql_old_password using '00';
ERROR HY000: Password hash should be a 16-digit hexadecimal number
create user foo4 identified via mysql_old_password using '11111111111111111111111111111111111111111';
ERROR HY000: Password hash should be a 16-digit hexadecimal number
+set GLOBAL sql_mode=default;