From ba716c80f1641772400a830060d11c9d3f5b6aee Mon Sep 17 00:00:00 2001
From: "acurtis@pcgem.rdg.cyberkinetica.com" <>
Date: Mon, 31 Jan 2005 13:18:36 +0000
Subject: [PATCH] Bug#7011   Fix tests after merge from 4.0

---
 mysql-test/r/rpl_multi_update2.result | 8 ++++----
 mysql-test/t/rpl_multi_update2.test   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/rpl_multi_update2.result b/mysql-test/r/rpl_multi_update2.result
index 40193f43e49..99356ebf970 100644
--- a/mysql-test/r/rpl_multi_update2.result
+++ b/mysql-test/r/rpl_multi_update2.result
@@ -1,17 +1,17 @@
-slave stop;
+stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
+start slave;
 CREATE TABLE t1 (
 a int unsigned not null auto_increment primary key,
 b int unsigned
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 CREATE TABLE t2 (
 a int unsigned not null auto_increment primary key,
 b int unsigned
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (NULL, 0);
 INSERT INTO t1 SELECT NULL, 0 FROM t1;
 INSERT INTO t2 VALUES (NULL, 0), (NULL,1);
diff --git a/mysql-test/t/rpl_multi_update2.test b/mysql-test/t/rpl_multi_update2.test
index 8216056aca5..bba7700a88e 100644
--- a/mysql-test/t/rpl_multi_update2.test
+++ b/mysql-test/t/rpl_multi_update2.test
@@ -7,12 +7,12 @@ source include/master-slave.inc;
 CREATE TABLE t1 (
  a int unsigned not null auto_increment primary key,
  b int unsigned
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 CREATE TABLE t2 (
  a int unsigned not null auto_increment primary key,
  b int unsigned
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 INSERT INTO t1 VALUES (NULL, 0);
 INSERT INTO t1 SELECT NULL, 0 FROM t1;