diff options
| author | unknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-14 17:50:32 -0400 |
|---|---|---|
| committer | unknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-14 17:50:32 -0400 |
| commit | 2ffd95c4c900825713aa84925a65df0b756b12c8 (patch) | |
| tree | b533d7d870280e6c4b21189c2e762ffcc7afd1e8 /mysql-test | |
| parent | 3e21b9d0dad908d1e0b0d414bf2186fa24e05616 (diff) | |
| parent | 0988e2c80f102387f6bb1d17e21a3bf2d0ba04bc (diff) | |
| download | mariadb-git-2ffd95c4c900825713aa84925a65df0b756b12c8.tar.gz | |
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/partition.result | 14 | ||||
| -rw-r--r-- | mysql-test/t/partition.test | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index e5b1d443f56..4983ad1817e 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -839,6 +839,19 @@ SHOW TABLE STATUS; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 MyISAM 10 Dynamic 0 0 0 0 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned DROP TABLE t1; +CREATE TABLE t1 (a int) +PARTITION BY LIST (a) +(PARTITION p0 VALUES IN (NULL)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) +DROP TABLE t1; +CREATE TABLE t1 (a int) +PARTITION BY RANGE(a) +(PARTITION p0 VALUES LESS THAN (NULL)); +ERROR 42000: Not allowed to use NULL value in VALUES LESS THAN near '))' at line 3 create table t1 (a int) partition by list (a) (partition `s1 s2` values in (0)); @@ -865,6 +878,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) DROP TABLE t1; +>>>>>>> create table t1 (s1 int auto_increment primary key) partition by list (s1) (partition p1 values in (1), diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 536ab68a694..272cdc27af6 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -989,6 +989,11 @@ PARTITION BY LIST (a) SHOW CREATE TABLE t1; DROP TABLE t1; +--error 1064 +CREATE TABLE t1 (a int) +PARTITION BY RANGE(a) +(PARTITION p0 VALUES LESS THAN (NULL)); + # # Bug#18753 Partitions: auto_increment fails # |