diff options
| author | unknown <mskold@mysql.com> | 2005-11-18 15:54:53 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-11-18 15:54:53 +0100 |
| commit | 55a82cd031244647f896a92cfa25f50a63e7767f (patch) | |
| tree | 1e08e92182912e579691f077e1b080b0d828c598 /mysql-test | |
| parent | 3fcf882b9d65b1d4fd48f08222c8d557cc609fc0 (diff) | |
| parent | bb8bee51e4a6340bc14a825abc62c656152ee56c (diff) | |
| download | mariadb-git-55a82cd031244647f896a92cfa25f50a63e7767f.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
mysql-test/t/ndb_alter_table.test:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/ndb_alter_table.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 4f76380f94c..70c48bba112 100644 --- a/mysql-test/t/ndb_alter_table.test +++ b/mysql-test/t/ndb_alter_table.test @@ -142,6 +142,7 @@ INSERT INTO t1 VALUES (1,2,0),(18,19,4),(20,21,0); select c from t1 order by c; drop table t1; +--disable_ps_protocol create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) ) engine=ndb; insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three'); @@ -157,6 +158,7 @@ select * from t1 where b = 'two'; select * from t1 where b = 'two'; connection server1; drop table t1; +--enable_ps_protocol #--disable_warnings #DROP TABLE IF EXISTS t2; |