summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql_upgrade-6984.result
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2015-10-15 12:11:17 +0300
committerMichael Widenius <monty@mariadb.org>2015-10-21 16:31:11 +0300
commit18f7dfed179204dcfc02a27790e22bb9cc4e2e32 (patch)
treecf404263c6ee35c5e9c80811f5fd3845c0b98aca /mysql-test/r/mysql_upgrade-6984.result
parent95faf34d859aee242812fae31629b224feeb868a (diff)
downloadmariadb-git-18f7dfed179204dcfc02a27790e22bb9cc4e2e32.tar.gz
Allow mysql_upgrade to enable event after table is corrected
new features: set event_scheduler=ON|OFF will now try to init event scheduler if it's not enabled set event_scheduler=default will try to enable it based on the value of the event_scheduler when mysqld was started
Diffstat (limited to 'mysql-test/r/mysql_upgrade-6984.result')
-rw-r--r--mysql-test/r/mysql_upgrade-6984.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_upgrade-6984.result b/mysql-test/r/mysql_upgrade-6984.result
index 7890b66d494..6aea4806ddb 100644
--- a/mysql-test/r/mysql_upgrade-6984.result
+++ b/mysql-test/r/mysql_upgrade-6984.result
@@ -57,3 +57,4 @@ Phase 6/6: Running 'FLUSH PRIVILEGES'
OK
update mysql.user set password='' where user='root';
flush privileges;
+set global event_scheduler=OFF;