summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@gleb.loc>2007-09-05 11:35:29 +0500
committerunknown <gshchepa/uchum@gleb.loc>2007-09-05 11:35:29 +0500
commit6a71b067b03c43d90012718cce2b040892c7ac86 (patch)
tree54adc23f3906efe6fc933b722353efcb5c830e94 /mysql-test
parent0aefd73b3dda1705270fb756329c32e10e1cc476 (diff)
downloadmariadb-git-6a71b067b03c43d90012718cce2b040892c7ac86.tar.gz
Fixed bug #29938.
mysqldump --skip-events --all-databases dumped data of the mysqld.event table, and during the restoration from this dump events were created in spite of the --skip-events option. The mysqldump client has been modified to ignore mysql.event table data in case of --skip-events options. client/mysqldump.c: Fixed bug #29938. The dump_table function has been modified to skip dumping of the mysql.event table data in case of the --skip-event mysqldump client option. mysql-test/t/mysqldump.test: Updated test case for bug #29938. mysql-test/r/mysqldump.result: Updated test case for bug #29938.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqldump.result13
-rw-r--r--mysql-test/t/mysqldump.test16
2 files changed, 29 insertions, 0 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 58bcac42f9c..d8688ea5509 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -4177,5 +4177,18 @@ set names latin1;
# Cleanup.
DROP DATABASE mysqldump_test_db;
#
+# BUG#29938: wrong behavior of mysqldump --skip-events
+# with --all-databases
+#
+TRUNCATE mysql.event;
+USE test;
+CREATE event e29938 ON SCHEDULE AT '2035-12-31 20:01:23' DO SET @bug29938=29938;
+SHOW EVENTS;
+Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
+test e29938 root@localhost SYSTEM ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
+TRUNCATE mysql.event;
+SHOW EVENTS;
+Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
+#
# End of 5.1 tests
#
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 171434f9dfd..0440b0fb63a 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1756,5 +1756,21 @@ DROP DATABASE mysqldump_test_db;
###########################################################################
--echo #
+--echo # BUG#29938: wrong behavior of mysqldump --skip-events
+--echo # with --all-databases
+--echo #
+
+TRUNCATE mysql.event;
+
+USE test;
+CREATE event e29938 ON SCHEDULE AT '2035-12-31 20:01:23' DO SET @bug29938=29938;
+SHOW EVENTS;
+--exec $MYSQL_DUMP --skip-events --all-databases > $MYSQLTEST_VARDIR/tmp/bug29938.sql
+
+TRUNCATE mysql.event;
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29938.sql
+SHOW EVENTS;
+
+--echo #
--echo # End of 5.1 tests
--echo #