summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql_upgrade.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/mysql_upgrade.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/mysql_upgrade.result')
-rw-r--r--mysql-test/r/mysql_upgrade.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 737f8b63783..c34707383b0 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -1,3 +1,4 @@
+set sql_mode="";
Run mysql_upgrade once
Phase 1/6: Checking and upgrading mysql database
Processing databases
@@ -457,4 +458,5 @@ even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@loca
even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost
DROP USER very_long_user_name_number_1, very_long_user_name_number_2, even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost;
DROP PROCEDURE test.pr;
+set sql_mode=default;
End of tests