diff options
| author | unknown <istruewing@stella.local> | 2008-03-26 10:27:00 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-26 10:27:00 +0100 |
| commit | 03c110ea217b89c308b7f08c8eb400f47a074b2e (patch) | |
| tree | 69df040c98a9edd26de9be04066dff14eb50319e /mysql-test/suite/ndb | |
| parent | 2daa01682775d42bbe00d3fb41e0865079240de8 (diff) | |
| parent | a1de91e7082816f05bcafc2b321e5f82eb66054b (diff) | |
| download | mariadb-git-03c110ea217b89c308b7f08c8eb400f47a074b2e.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/ctype_big5.result:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_gb2312.result:
Auto merged
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/lib/mtr_report.pl:
SCCS merged
Diffstat (limited to 'mysql-test/suite/ndb')
| -rw-r--r-- | mysql-test/suite/ndb/r/ndb_partition_key.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_partition_key.test | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/mysql-test/suite/ndb/r/ndb_partition_key.result b/mysql-test/suite/ndb/r/ndb_partition_key.result index d87b59d6c0e..ed84b90951b 100644 --- a/mysql-test/suite/ndb/r/ndb_partition_key.result +++ b/mysql-test/suite/ndb/r/ndb_partition_key.result @@ -105,6 +105,12 @@ PARTITION BY KEY(a) drop table t1; CREATE TABLE t1 (a int not null primary key); ALTER TABLE t1 +ENGINE = NDB +PARTITION BY KEY(a) +(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB); +drop table t1; +CREATE TABLE t1 (a int not null primary key) ENGINE = NDB; +ALTER TABLE t1 PARTITION BY KEY(a) (PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB); drop table t1; @@ -160,7 +166,6 @@ t1 CREATE TABLE `t1` ( alter table t1 partition by key(a) (partition p0 engine=ndb, partition p1); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL alter table t1 engine=ndb partition by key(a) diff --git a/mysql-test/suite/ndb/t/ndb_partition_key.test b/mysql-test/suite/ndb/t/ndb_partition_key.test index df351ea42c7..be76389f38d 100644 --- a/mysql-test/suite/ndb/t/ndb_partition_key.test +++ b/mysql-test/suite/ndb/t/ndb_partition_key.test @@ -79,6 +79,14 @@ drop table t1; CREATE TABLE t1 (a int not null primary key); ALTER TABLE t1 +ENGINE = NDB +PARTITION BY KEY(a) +(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB); + +drop table t1; + +CREATE TABLE t1 (a int not null primary key) ENGINE = NDB; +ALTER TABLE t1 PARTITION BY KEY(a) (PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB); @@ -116,7 +124,10 @@ show create table t1; alter table t1 remove partitioning; show create table t1; ---error ER_MIX_HANDLER_ERROR +# after bug#31931 was fixed +# this is OK, since the storage engine is specified +# on table level before. +#--error ER_MIX_HANDLER_ERROR alter table t1 partition by key(a) (partition p0 engine=ndb, partition p1); |