fix result file for ndb_multi

mysql-test/r/ndb_multi.result:
  update result file for new behaviour of correcting the 241 error on ha_open
mysql-test/t/ndb_multi.test:
  no longer errors on ha_open with 241

2 files changed, 4 insertions, 5 deletions

diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/r/ndb_multi.result
index 351cd7e35c5..dc80b0ca1ce 100644
--- a/mysql-test/r/ndb_multi.result
+++ b/mysql-test/r/ndb_multi.result
@@ -29,7 +29,8 @@ drop table t1;
 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 @@ a	b	c	last_col
 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
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index ce8ce420793..5fb964facdf 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -37,8 +37,6 @@ drop table t1;
 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;