bk commit into 5.1 tree (jonas:1.2278)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2006-08-22 11:55:25+02:00, jonas@stripped +1 -0
  ndb -
    add another possible ok error in testcase

  mysql-test/t/ndb_binlog_discover.test@stripped, 2006-08-22 11:55:22+02:00, jonas@stripped +1 -1
    add another possible ok error in testcase

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.2/mysql-test/t/ndb_binlog_discover.test	2006-08-22 11:55:32 +02:00
+++ 1.3/mysql-test/t/ndb_binlog_discover.test	2006-08-22 11:55:32 +02:00
@@ -20,7 +20,7 @@
 while ($mysql_errno)
 {
   # Table t1 is readonly until the mysqld has reconnected properly
-  --error 0,1036
+  --error 0,1036,1296
   insert into t1 values(1);
   if ($mysql_errno)
   {