diff options
author | Luis Soares <luis.soares@sun.com> | 2009-02-11 18:46:43 +0100 |
---|---|---|
committer | Luis Soares <luis.soares@sun.com> | 2009-02-11 18:46:43 +0100 |
commit | 8db289c4d56940489e801b06a631e04fdcb1fbc4 (patch) | |
tree | 97519e6707cc387d890a445c98b99cbb60c0c602 /mysql-test/suite | |
parent | 2238eaaffb17a3344c00f36cc43f06319fe7a778 (diff) | |
download | mariadb-git-8db289c4d56940489e801b06a631e04fdcb1fbc4.tar.gz |
BUG#13684: post push fix for test case.
The test case relies on binlog entries for assertion. The problem is that the
binlog does not get cleaned in pushbuild between tests, resulting in extra
entries in the result file, causing the test to fail.
This fix adds a reset master at the beginning of the test, so that we get a
clean binlog file.
Diffstat (limited to 'mysql-test/suite')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_drop_if_exists.result | 1 | ||||
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_drop_if_exists.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_drop_if_exists.result b/mysql-test/suite/rpl/r/rpl_drop_if_exists.result index bc02dd22561..59a2470cfdb 100644 --- a/mysql-test/suite/rpl/r/rpl_drop_if_exists.result +++ b/mysql-test/suite/rpl/r/rpl_drop_if_exists.result @@ -1,3 +1,4 @@ +RESET MASTER; DROP PROCEDURE IF EXISTS db_bug_13684.p; DROP FUNCTION IF EXISTS db_bug_13684.f; DROP TRIGGER IF EXISTS db_bug_13684.tr; diff --git a/mysql-test/suite/rpl/t/rpl_drop_if_exists.test b/mysql-test/suite/rpl/t/rpl_drop_if_exists.test index 41abdc51fd1..6b2b37ae791 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_if_exists.test +++ b/mysql-test/suite/rpl/t/rpl_drop_if_exists.test @@ -40,6 +40,7 @@ # http://dev.mysql.com/doc/refman/5.1/en/sql-syntax-data-definition.html # --source include/have_log_bin.inc +RESET MASTER; disable_warnings; |