Commit a26c4b15 authored by unknown's avatar unknown
Browse files

BUG#18752 

Fixed forgotten merge fix


mysql-test/r/partition.result:
  Fixed forgotten merge fix
parent d9c1d258

mysql-test/r/partition.result

+4 −14
Original line number Diff line number Diff line
@@ -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),