bk commit into 5.1 tree (tomas:1.1972)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1972 05/06/16 18:02:03 tomas@stripped +2 -0
  updated bank test case

  mysql-test/t/rpl_ndb_bank.test
    1.5 05/06/16 18:01:57 tomas@stripped +10 -15
    updated bank test case

  mysql-test/r/rpl_ndb_bank.result
    1.4 05/06/16 18:01:57 tomas@stripped +4 -6
    updated bank test case

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325

--- 1.3/mysql-test/r/rpl_ndb_bank.result	2005-05-13 04:59:17 +02:00
+++ 1.4/mysql-test/r/rpl_ndb_bank.result	2005-06-16 18:01:57 +02:00
@@ -5,14 +5,12 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 STOP SLAVE;
-DELETE FROM cluster_replication.binlog_index;
-DROP DATABASE IF EXISTS BANK;
+CREATE DATABASE IF NOT EXISTS BANK;
+DROP DATABASE BANK;
 CREATE DATABASE BANK;
-RESET SLAVE;
-DELETE FROM cluster_replication.binlog_index;
-DROP DATABASE IF EXISTS BANK;
+CREATE DATABASE IF NOT EXISTS BANK;
+DROP DATABASE BANK;
 CREATE DATABASE BANK;
-RESET MASTER;
 USE BANK;
 CREATE TABLE GL ( TIME BIGINT UNSIGNED NOT NULL,
 ACCOUNT_TYPE INT UNSIGNED NOT NULL,

--- 1.4/mysql-test/t/rpl_ndb_bank.test	2005-05-19 20:37:24 +02:00
+++ 1.5/mysql-test/t/rpl_ndb_bank.test	2005-06-16 18:01:57 +02:00
@@ -19,22 +19,19 @@
 --source include/master-slave.inc
 
 --disable_warnings
-# stop the save
+# initialize slave
 --connection slave
 STOP SLAVE;
-DELETE FROM cluster_replication.binlog_index;
-DELETE FROM cluster_replication.apply_status;
-DROP DATABASE IF EXISTS BANK;
+#to make sure we trop any ndbcluster tables
+CREATE DATABASE IF NOT EXISTS BANK;
+DROP DATABASE BANK;
 CREATE DATABASE BANK;
-RESET SLAVE;
 
-# reset master
+# initialize master
 --connection master
-DELETE FROM cluster_replication.binlog_index;
-DELETE FROM cluster_replication.apply_status;
-DROP DATABASE IF EXISTS BANK;
+CREATE DATABASE IF NOT EXISTS BANK;
+DROP DATABASE BANK;
 CREATE DATABASE BANK;
-RESET MASTER;
 --enable_warnings
 
 #
@@ -112,9 +109,8 @@
 
 # restore on slave, first check that nothing is there
 --connection slave
-
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 32 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 32 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
 
 SHOW TABLES;
 
@@ -153,14 +149,13 @@
 
 
 #
-# Now loop and check consistency each time on slave
+# Now loop and check consistency every 2 seconds on slave
 #
 --connection slave
 --let $1=10
 while ($1)
 {
   --sleep 2
-  --echo $1
   --replace_result $MASTER_MYPORT MASTER_PORT
   --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master>
   SHOW SLAVE STATUS;