bzr commit into mysql-5.1-bugteam branch (luis.soares:2752) Bug#13684

[Luis Soares]

#At file:///home/lsoares/Workspace/mysql-server/bugfix/13684/5.1-bt/ based on revid:luis.soares@stripped

 2752 Luis Soares	2009-02-11
      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.
modified:
  mysql-test/suite/rpl/r/rpl_drop_if_exists.result
  mysql-test/suite/rpl/t/rpl_drop_if_exists.test

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_if_exists.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_if_exists.result	2009-02-10 10:52:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_if_exists.result	2009-02-11 17:12:25 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/t/rpl_drop_if_exists.test'
--- a/mysql-test/suite/rpl/t/rpl_drop_if_exists.test	2009-02-10 10:52:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_drop_if_exists.test	2009-02-11 17:12:25 +0000
@@ -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;