bk commit into 5.1 tree (hezx:1.2548) BUG#33029

[hezx]

Below is the list of changes that have just been committed into a local
5.1 repository of hezx.  When hezx does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-27 13:48:04+08:00, hezx@stripped +2 -0
  post fix after push of bug#33029

  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result@stripped, 2008-03-27 13:47:59+08:00, hezx@stripped +5 -0
    clean up objects used by test

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@stripped, 2008-03-27 13:47:59+08:00, hezx@stripped +9 -0
    clean up objects used by test

diff -Nrup a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result b/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
--- a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result	2008-03-14 11:35:36 +08:00
+++ b/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result	2008-03-27 13:47:59 +08:00
@@ -31,3 +31,8 @@ id
 17
 18
 19
+DROP TABLE IF EXISTS t1, t2;
+DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p2;
+DROP FUNCTION IF EXISTS f1;
+DROP TRIGGER IF EXISTS tr1;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
--- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2008-03-14 11:35:36 +08:00
+++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2008-03-27 13:47:59 +08:00
@@ -34,3 +34,12 @@ enable_result_log;
 echo # Result on slave;
 SELECT * FROM t1;
 SELECT * FROM t2;
+
+# clean up
+disable_warnings;
+DROP TABLE IF EXISTS t1, t2;
+DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p2;
+DROP FUNCTION IF EXISTS f1;
+DROP TRIGGER IF EXISTS tr1;
+enable_warnings;