diff options
| author | mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-04-17 18:56:58 -0400 |
|---|---|---|
| committer | mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-04-17 18:56:58 -0400 |
| commit | 9c6aef5b4e31436a026f5c81fd0626882c18cf62 (patch) | |
| tree | 904b3ec0214c18cb0ef36e226676ebe751289682 | |
| parent | 93f965d1fe4b4cec901aeddc43de3b0bc78e3758 (diff) | |
| download | mariadb-git-9c6aef5b4e31436a026f5c81fd0626882c18cf62.tar.gz | |
BUG#18752
Fixed forgotten merge fix
| -rw-r--r-- | mysql-test/r/partition.result | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 4983ad1817e..0da071374ea 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -839,19 +839,6 @@ 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)); @@ -878,7 +865,10 @@ 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 (s1 int auto_increment primary key) partition by list (s1) (partition p1 values in (1), |