List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:January 6 2006 12:09am
Subject:bk commit into 5.1 tree (jmiller:1.2043)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.2043 06/01/06 01:09:17 jmiller@stripped +4 -0
  Test case clean-up do to causing other test failures

  mysql-test/r/rpl_multi_engine.result
    1.2 06/01/06 01:08:20 jmiller@stripped +1 -0
    New result file

  mysql-test/t/rpl_multi_engine.test
    1.2 06/01/06 01:08:11 jmiller@stripped +2 -0
    Fixed test bug

  mysql-test/r/rpl_drop_db.result
    1.5 06/01/06 01:07:54 jmiller@stripped +1 -1
    New result file

  mysql-test/t/rpl_drop_db.test
    1.7 06/01/06 01:07:25 jmiller@stripped +3 -2
    Fixed test bug

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.1/mysql-test/r/rpl_multi_engine.result	2005-12-22 06:34:52 +01:00
+++ 1.2/mysql-test/r/rpl_multi_engine.result	2006-01-06 01:08:20 +01:00
@@ -363,3 +363,4 @@
 select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
 id	hex(b1)	vc	bc	d	f	total	y	t
 DROP TABLE t1;
+DROP DATABASE mysqltest1;

--- 1.1/mysql-test/t/rpl_multi_engine.test	2005-12-22 06:34:59 +01:00
+++ 1.2/mysql-test/t/rpl_multi_engine.test	2006-01-06 01:08:11 +01:00
@@ -94,6 +94,8 @@
 # cleanup
 connection master;
 DROP TABLE t1;
+# Need to drop mysqltest1 as well so other test will pass.
+DROP DATABASE mysqltest1;
 sync_slave_with_master;
 
 # End of 5.1 test case

--- 1.4/mysql-test/r/rpl_drop_db.result	2005-08-24 22:07:58 +02:00
+++ 1.5/mysql-test/r/rpl_drop_db.result	2006-01-06 01:07:54 +01:00
@@ -31,5 +31,5 @@
 select * from t1;
 n
 1234
-drop table t1;
+DROP DATABASE mysqltest1;
 stop slave;

--- 1.6/mysql-test/t/rpl_drop_db.test	2005-11-14 14:39:37 +01:00
+++ 1.7/mysql-test/t/rpl_drop_db.test	2006-01-06 01:07:25 +01:00
@@ -46,12 +46,13 @@
 use test;
 select * from t1;
 
+system rm  var/master-data/mysqltest1/f1.txt;
 connection master;
-drop table t1;
+DROP DATABASE mysqltest1;
 sync_slave_with_master;
 
 #cleanup
 connection slave;
 stop slave;
-system rm -rf var/master-data/mysqltest1;
+#system rm -rf var/master-data/mysqltest1;
 
Thread
bk commit into 5.1 tree (jmiller:1.2043)Jonathan Miller6 Jan