Commit 2ffd95c4 authored by unknown's avatar unknown
Browse files

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
parents 3e21b9d0 0988e2c8

mysql-test/r/partition.result

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

mysql-test/t/partition.test

+5 −0
Original line number Diff line number Diff line
@@ -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

#

sql/share/errmsg.txt

+3 −0
Original line number Diff line number Diff line
@@ -5826,6 +5826,9 @@ ER_NDB_CANT_SWITCH_BINLOG_FORMAT 
	eng "The NDB cluster engine does not support changing the binlog format on the fly yet"

ER_PARTITION_NO_TEMPORARY

	eng "Cannot create temporary table with partitions"

ER_NULL_IN_VALUES_LESS_THAN

        eng "Not allowed to use NULL value in VALUES LESS THAN"

        swe "Det r inte tilltet att anvnda NULL-vrden i VALUES LESS THAN"

ER_WRONG_PARTITION_NAME

        eng "Incorrect partition name"

        swe "Felaktigt partitionsnamn"

sql/sql_yacc.yy

+5 −0
Original line number Diff line number Diff line
@@ -3721,6 +3721,11 @@ part_func_max: 
            yyerror(ER(ER_PARTITION_MAXVALUE_ERROR));

            YYABORT;

          }

          if (Lex->part_info->curr_part_elem->has_null_value)

          {

            yyerror(ER(ER_NULL_IN_VALUES_LESS_THAN));

            YYABORT;

          }

        }

        ;