bk commit into 5.1 tree (pekka:1.2142) BUG#17505

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2142 06/02/20 17:20:54 pekka@stripped +2 -0
  ndb - enable rpl_ndb_blob2  bug#17505

  mysql-test/t/disabled.def
    1.80 06/02/20 17:19:32 pekka@stripped +0 -2
    enable rpl_ndb_blob2 (sleep fixed)

  mysql-test/extra/rpl_tests/rpl_row_blob.test
    1.4 06/02/20 17:19:32 pekka@stripped +4 -2
    enable rpl_ndb_blob2 (sleep fixed)

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51

--- 1.3/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-02-10 16:50:07 +01:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-02-20 17:19:32 +01:00
@@ -40,6 +40,7 @@
 save_master_pos;
 connection slave;
 sync_with_master; 
+sleep 5;
 --echo
 --echo **** Data Insert Validation Slave Section test.t1 ****
 --echo
@@ -61,10 +62,10 @@
 SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 # Sleep is needed for NDB to allow time for
 # Injector thread to populate the bin log.
-sleep 10;
 save_master_pos;
 connection slave;
 sync_with_master; 
+sleep 5;
 --echo
 --echo **** Data Update Validation Slave Section test.t1 ****
 --echo
@@ -135,6 +136,7 @@
 save_master_pos;
 connection slave;
 sync_with_master; 
+sleep 5;
 --echo
 --echo **** Data Insert Validation Slave Section test.t2 ****
 --echo
@@ -159,10 +161,10 @@
 FROM test.t2 WHERE c1=2;
 # Sleep is needed for NDB to allow time for
 # Injector thread to populate the bin log.
-sleep 15;
 save_master_pos;
 connection slave;
 sync_with_master; 
+sleep 5;
 --echo
 --echo **** Data Update Validation Slave Section test.t2 ****
 --echo

--- 1.79/mysql-test/t/disabled.def	2006-02-20 12:25:04 +01:00
+++ 1.80/mysql-test/t/disabled.def	2006-02-20 17:19:32 +01:00
@@ -33,7 +33,5 @@
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
-#rpl_ndb_blob            : Bug #17505
-rpl_ndb_blob2           : Bug #17505
 rpl_ndb_log             : results are not deterministic
 mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes