summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2005-12-14 14:49:59 +0100
committerunknown <mskold@mysql.com>2005-12-14 14:49:59 +0100
commitc1d403cb0929ff1217c829cf9dc0cf6aa63b5ec4 (patch)
tree0540f5abaaa6db015533c5584ae96752cc670ad1 /mysql-test
parentf7489c32a26080f148efa7f251bb06d3b8e1ce8a (diff)
parentd70270c41ff1f34e6f9eb8565957632b877e28da (diff)
downloadmariadb-git-c1d403cb0929ff1217c829cf9dc0cf6aa63b5ec4.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ndb_multi.result1
-rw-r--r--mysql-test/t/ndb_multi.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/r/ndb_multi.result
index 2080be241e8..bd3af223a65 100644
--- a/mysql-test/r/ndb_multi.result
+++ b/mysql-test/r/ndb_multi.result
@@ -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
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index 760150c6f6a..1183f2b283f 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -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