summaryrefslogtreecommitdiff
path: root/mysql-test/r/events_restart.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-05-04 16:59:24 +0400
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-05-04 16:59:24 +0400
commit16f26d2aaf65c2d69e24b7d644cc48a628a55862 (patch)
treed2b8fa6e7061d19a7f00c761431d8cec474c792d /mysql-test/r/events_restart.result
parentf9abd1ab314d3f36ad6d2fe708e6a0ba6a7cb058 (diff)
downloadmariadb-git-16f26d2aaf65c2d69e24b7d644cc48a628a55862.tar.gz
Patch for Bug#12394306: the sever may crash if mysql.event is corrupted.
The problem was that wrong structure of mysql.event was not detected and the server continued to use wrongly-structured data. The fix is to check the structure of mysql.event after opening before any use. That makes operations with events more strict -- some operations that might work before throw errors now. That seems to be Ok. Another side-effect of the patch is that if mysql.event is corrupted, unrelated DROP DATABASE statements issue an SQL warning about inability to open mysql.event table.
Diffstat (limited to 'mysql-test/r/events_restart.result')
-rw-r--r--mysql-test/r/events_restart.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/events_restart.result b/mysql-test/r/events_restart.result
index 4db61d357ce..6a751fa29f8 100644
--- a/mysql-test/r/events_restart.result
+++ b/mysql-test/r/events_restart.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression("Column count of mysql.event is wrong. Expected .*, found .*\. The table is probably corrupted");
set global event_scheduler=off;
drop database if exists events_test;
create database events_test;
@@ -52,6 +53,8 @@ Warnings:
Note 1008 Can't drop database 'mysqltest_database_not_exists'; database doesn't exist
create database mysqltest_db1;
drop database mysqltest_db1;
+Warnings:
+Error 1545 Failed to open mysql.event
Restore the original mysql.event table
drop table mysql.event;
rename table event_like to mysql.event;