summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-24 18:13:00 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-24 18:13:00 +0400
commit71929d76d06bb1f3df48fc8d8cd34f50feba4442 (patch)
tree075d93c794b46baa7874d03272678f65c2f0e7c2
parentb69a31fad5e41494c3c696f369d0c4ce48de45e3 (diff)
downloadmariadb-git-71929d76d06bb1f3df48fc8d8cd34f50feba4442.tar.gz
Fixed an incorrectly merged .result file.
-rw-r--r--mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result12
1 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
index 6db3642f3b5..579e5eb02e9 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
@@ -11314,18 +11314,6 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS tt_xx_1
###################################################################################
# CLEAN
###################################################################################
-DROP TABLE tt_1;
-DROP TABLE tt_2;
-DROP TABLE tt_3;
-DROP TABLE tt_4;
-DROP TABLE nt_1;
-DROP TABLE nt_2;
-DROP TABLE nt_3;
-DROP TABLE nt_4;
-DROP PROCEDURE pc_i_tt_3;
-DROP FUNCTION f1;
-DROP FUNCTION f2;
-stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;