Commit 973dedbf authored by mskold@mysql.com's avatar mskold@mysql.com
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents b7c11c87 c08ee431

mysql-test/r/ndb_multi.result

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 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

flush table t1;

select * from t1;

a

2

mysql-test/t/ndb_multi.test

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ connection server1; 
# Currently a retry is required remotely

--error 1296

select * from t1;

flush table t1;

select * from t1;



# Connect to server2 and use the tables from there