diff options
author | unknown <mskold@mysql.com> | 2004-08-10 11:48:43 +0200 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2004-08-10 11:48:43 +0200 |
commit | 04cc2cc4d12b973c533cd35a6050932f82fb4ca3 (patch) | |
tree | bb02127efd31bb5412acc81f4311af0789100d06 /mysql-test/t/ndb_alter_table.test | |
parent | 60abaef6b03c02c978d45b6fdc16f2b948806407 (diff) | |
parent | ce804e4c7bc514cb6823effb7ac396740be8f359 (diff) | |
download | mariadb-git-04cc2cc4d12b973c533cd35a6050932f82fb4ca3.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ndb_alter_table.test')
-rw-r--r-- | mysql-test/t/ndb_alter_table.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 96f6f631eff..52b35146f5c 100644 --- a/mysql-test/t/ndb_alter_table.test +++ b/mysql-test/t/ndb_alter_table.test @@ -29,7 +29,7 @@ col2 varchar(30) not null, col3 varchar (20) not null, col4 varchar(4) not null, col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null, -col6 int not null, to_be_deleted int); +col6 int not null, to_be_deleted int) ENGINE=ndbcluster; insert into t1 values (2,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (25, 4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7); select * from t1 order by col1; alter table t1 |