bk commit into 5.1 tree (tomas:1.2043)

[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.2043 06/01/05 17:49:02 tomas@stripped +5 -0
  test fixes

  mysql-test/t/rpl_ndb_basic.test
    1.2 06/01/05 17:48:54 tomas@stripped +1 -1
    test fixes

  mysql-test/t/ps.test
    1.58 06/01/05 17:48:53 tomas@stripped +2 -1
    test fixes

  mysql-test/t/disabled.def
    1.32 06/01/05 17:48:53 tomas@stripped +2 -0
    test fixes

  mysql-test/r/ps.result
    1.58 06/01/05 17:48:53 tomas@stripped +2 -1
    test fixes

  mysql-test/r/mysqlcheck.result
    1.3 06/01/05 17:48:53 tomas@stripped +1 -0
    test fixes

# 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-v6

--- 1.2/mysql-test/r/mysqlcheck.result	2005-11-06 13:12:47 +01:00
+++ 1.3/mysql-test/r/mysqlcheck.result	2006-01-05 17:48:53 +01:00
@@ -1,3 +1,4 @@
+cluster_replication.binlog_index                   OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.func                                         OK

--- 1.31/mysql-test/t/disabled.def	2006-01-05 15:47:35 +01:00
+++ 1.32/mysql-test/t/disabled.def	2006-01-05 17:48:53 +01:00
@@ -28,3 +28,5 @@
 ndb_autodiscover : TBF with CR
 ndb_autodiscover2 : TBF with CR
 ndb_rpl_basic   : Results are not deterministic, Tomas will fix
+rpl_ndb_basic   : Bug#16228
+rpl_ndb_idempotent : TBF with cluster DD push, fails on slave insert of a row that does not exist

--- 1.57/mysql-test/r/ps.result	2005-12-26 08:16:29 +01:00
+++ 1.58/mysql-test/r/ps.result	2006-01-05 17:48:53 +01:00
@@ -529,7 +529,8 @@
                 WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA
                 AND A.TABLE_NAME = B.TABLE_NAME
                 AND A.COLUMN_NAME = B.COLUMN_NAME AND
-                A.TABLE_NAME = 'user'";
+                A.TABLE_NAME = 'user' AND
+                A.TABLE_SCHEMA NOT IN ('cluster_replication')";
 prepare my_stmt from @aux;
 execute my_stmt;
 COUNT(*)

--- 1.57/mysql-test/t/ps.test	2005-12-26 08:16:29 +01:00
+++ 1.58/mysql-test/t/ps.test	2006-01-05 17:48:53 +01:00
@@ -552,7 +552,8 @@
                 WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA
                 AND A.TABLE_NAME = B.TABLE_NAME
                 AND A.COLUMN_NAME = B.COLUMN_NAME AND
-                A.TABLE_NAME = 'user'";
+                A.TABLE_NAME = 'user' AND
+                A.TABLE_SCHEMA NOT IN ('cluster_replication')";
 
 let $exec_loop_count= 3;
 eval prepare my_stmt from @aux;

--- 1.1/mysql-test/t/rpl_ndb_basic.test	2006-01-05 12:02:06 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_basic.test	2006-01-05 17:48:54 +01:00
@@ -113,7 +113,7 @@
 # sleep longer than dead lock detection timeout in config
 # we do this 2 times, once with few retries to verify that we 
 # get a failure with the set sleep, and once with the _same_
-# sleep, but with more reties to get it to succed
+# sleep, but with more retries to get it to succeed
 --sleep 5
 
 # replication should have stopped, since max retries where not enough