List:Commits« Previous MessageNext Message »
From:Lars Thalmann Date:June 4 2007 5:09pm
Subject:bk commit into 5.1 tree (lars:1.2540) BUG#28882
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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, 2007-06-04 19:09:09+02:00, lars@stripped +2 -0
  BUG#28882: v2 did not exists in test
  do not have warnings in clean-up phase, the stuff should exist
  forgot to do cleanup on master

  mysql-test/r/rpl_invoked_features.result@stripped, 2007-06-04 19:09:05+02:00, lars@stripped +5 -6
    v2 did not exists in test
    do not have warnings in clean-up phase, the stuff should exist
    forgot to do cleanup on master

  mysql-test/t/rpl_invoked_features.test@stripped, 2007-06-04 19:09:05+02:00, lars@stripped +9 -9
    v2 did not exists in test
    do not have warnings in clean-up phase, the stuff should exist
    forgot to do cleanup on master

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.1-new-rpl

--- 1.1/mysql-test/r/rpl_invoked_features.result	2007-06-04 19:09:17 +02:00
+++ 1.2/mysql-test/r/rpl_invoked_features.result	2007-06-04 19:09:17 +02:00
@@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 USE test;
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
+DROP VIEW IF EXISTS v1;
 DROP PROCEDURE IF EXISTS p1;
 DROP FUNCTION IF EXISTS f1;
 
@@ -435,8 +435,7 @@ UPDATE t12 SET c='';
 UPDATE t13 SET c='';
 
 
-
-DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
-DROP PROCEDURE IF EXISTS p1;
-DROP FUNCTION IF EXISTS f1;
+DROP TABLE t1,t2,t3,t11,t12,t13;
+DROP VIEW v1;
+DROP PROCEDURE p1;
+DROP FUNCTION f1;

--- 1.2/mysql-test/t/rpl_invoked_features.test	2007-06-04 19:09:17 +02:00
+++ 1.3/mysql-test/t/rpl_invoked_features.test	2007-06-04 19:09:17 +02:00
@@ -27,7 +27,7 @@
 USE test;
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
+DROP VIEW IF EXISTS v1;
 DROP PROCEDURE IF EXISTS p1;
 DROP FUNCTION IF EXISTS f1;
 --enable_warnings
@@ -240,7 +240,7 @@ UPDATE t11 SET c='';
 UPDATE t12 SET c='';
 UPDATE t13 SET c='';
 
---sync_slave_with_master slave
+--sync_slave_with_master
 
 # Compare a data from master and slave
 --echo
@@ -259,12 +259,12 @@ UPDATE t13 SET c='';
 --exec rm $MYSQLTEST_VARDIR/tmp/rpl_invoked_features_slave.sql
 
 # Remove tables,views,procedures,functions
---echo
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t11,t12,t13;
-DROP VIEW IF EXISTS v1,v2;
-DROP PROCEDURE IF EXISTS p1;
-DROP FUNCTION IF EXISTS f1;
---enable_warnings
+
+--connection master
+DROP TABLE t1,t2,t3,t11,t12,t13;
+DROP VIEW v1;
+DROP PROCEDURE p1;
+DROP FUNCTION f1;
+sync_slave_with_master;
 
 # End 5.1 test case
Thread
bk commit into 5.1 tree (lars:1.2540) BUG#28882Lars Thalmann4 Jun