diff options
| author | unknown <mskold/marty@linux.site> | 2006-09-18 13:11:03 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-09-18 13:11:03 +0200 |
| commit | df3156a3bd5a983c0f078ffd119ffd4c45e54ddc (patch) | |
| tree | f46b76ac99525544e36d1731bfdd8d96fd843cad | |
| parent | fb88fe5b3f327447c412c31b6792cf436cb96c86 (diff) | |
| parent | 34edcac86c26ebd0ebdc22ae286845ef664ed043 (diff) | |
| download | mariadb-git-df3156a3bd5a983c0f078ffd119ffd4c45e54ddc.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/t/ndb_multi.test:
Auto merged
| -rw-r--r-- | mysql-test/r/ndb_multi.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/ndb_multi.test | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/r/ndb_multi.result index 1110fb9798c..c73d09b6541 100644 --- a/mysql-test/r/ndb_multi.result +++ b/mysql-test/r/ndb_multi.result @@ -67,6 +67,8 @@ c1 1 3 5 +show tables; +Tables_in_test create table t1(c1 int key)ENGINE=MyISAM; insert into t1 values(100),(344),(533); select * from t1 order by c1; diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test index 75558ba24fe..a8253b786d0 100644 --- a/mysql-test/t/ndb_multi.test +++ b/mysql-test/t/ndb_multi.test @@ -75,6 +75,7 @@ insert into t1 values(1),(3),(5); select * from t1 order by c1; connection server2; +show tables; create table t1(c1 int key)ENGINE=MyISAM; insert into t1 values(100),(344),(533); select * from t1 order by c1; |