bk commit into 5.0 tree (stewart:1.2271)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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-10-25 00:41:55+10:00, stewart@willster.(none) +2 -0
  fix result file for ndb_multi

  mysql-test/r/ndb_multi.result@stripped, 2006-10-25 00:41:52+10:00, stewart@willster.(none) +4 -3
    update result file for new behaviour of correcting the 241 error on ha_open

  mysql-test/t/ndb_multi.test@stripped, 2006-10-25 00:41:52+10:00, stewart@willster.(none) +0 -2
    no longer errors on ha_open with 241

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/ndb

--- 1.7/mysql-test/r/ndb_multi.result	2006-10-25 00:42:00 +10:00
+++ 1.8/mysql-test/r/ndb_multi.result	2006-10-25 00:42:00 +10:00
@@ -29,7 +29,8 @@
 create table t1 (a int) engine=ndbcluster;
 insert into t1 value (2);
 select * from t1;
-ERROR HY000: Got error 241 'Invalid schema object version' from ndbcluster
+a
+2
 flush table t1;
 select * from t1;
 a
@@ -54,13 +55,13 @@
 1	Hi!	89	Longtext column
 show status like 'handler_discover%';
 Variable_name	Value
-Handler_discover	1
+Handler_discover	2
 show tables like 't4';
 Tables_in_test (t4)
 t4
 show status like 'handler_discover%';
 Variable_name	Value
-Handler_discover	2
+Handler_discover	3
 show tables;
 Tables_in_test
 t1

--- 1.8/mysql-test/t/ndb_multi.test	2006-10-25 00:42:00 +10:00
+++ 1.9/mysql-test/t/ndb_multi.test	2006-10-25 00:42:00 +10:00
@@ -37,8 +37,6 @@
 create table t1 (a int) engine=ndbcluster;
 insert into t1 value (2);
 connection server1;
-# Currently a retry is required remotely
---error 1296
 select * from t1;
 flush table t1;
 select * from t1;