From 57c6470b59aa159e64fb3951e7a0c29f3a368625 Mon Sep 17 00:00:00 2001
From: unknown <skozlov/ksm@mysql.com/virtop.localdomain>
Date: Mon, 4 Jun 2007 20:44:25 +0400
Subject: [PATCH] WL#3694

mysql-test/r/rpl_invoked_features.result:
  updated result
mysql-test/t/rpl_invoked_features.test:
  updated test
---
 mysql-test/r/rpl_invoked_features.result |  8 ++++++--
 mysql-test/t/rpl_invoked_features.test   | 11 +++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/rpl_invoked_features.result b/mysql-test/r/rpl_invoked_features.result
index 428184fd803..6dae6909612 100644
--- a/mysql-test/r/rpl_invoked_features.result
+++ b/mysql-test/r/rpl_invoked_features.result
@@ -5,10 +5,12 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 USE test;
+DROP VIEW IF EXISTS v1,v11;
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
 DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
 
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b INT, c VARCHAR(64)) ENGINE=myisam;
 INSERT INTO t1 VALUES (1,1,'1');
@@ -436,7 +438,9 @@ UPDATE t13 SET c='';
 
 
 
+DROP VIEW IF EXISTS v1,v11;
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
 DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
diff --git a/mysql-test/t/rpl_invoked_features.test b/mysql-test/t/rpl_invoked_features.test
index d497a2db016..8815bbd2240 100644
--- a/mysql-test/t/rpl_invoked_features.test
+++ b/mysql-test/t/rpl_invoked_features.test
@@ -26,10 +26,12 @@
 
 USE test;
 --disable_warnings
+DROP VIEW IF EXISTS v1,v11;
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
 DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
 --enable_warnings
 
 
@@ -259,12 +261,17 @@ UPDATE t13 SET c='';
 --exec rm $MYSQLTEST_VARDIR/tmp/rpl_invoked_features_slave.sql
 
 # Remove tables,views,procedures,functions
+--connection master
 --echo
 --disable_warnings
+DROP VIEW IF EXISTS v1,v11;
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
 DROP PROCEDURE IF EXISTS p1;
+DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
+DROP FUNCTION IF EXISTS f2;
 --enable_warnings
 
+--sync_slave_with_master slave
+
 # End 5.1 test case