Commit 29c9ca33 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents 43cc9a50 33d1d38c

mysql-test/r/partition.result

+6 −0
Original line number Diff line number Diff line
@@ -422,4 +422,10 @@ partition_name partition_description table_rows 
x123	11,12	1

x234	NULL,1	1

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));

alter table t1 rebuild partition;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

drop table t1;

End of 5.1 tests

mysql-test/t/partition.test

+12 −0
Original line number Diff line number Diff line
@@ -540,4 +540,16 @@ select partition_name, partition_description, table_rows 
from information_schema.partitions where table_schema ='test';

drop table t1;



#

# BUG 17947 Crash with REBUILD PARTITION

#

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));



--error 1064

alter table t1 rebuild partition;



drop table t1;



--echo End of 5.1 tests

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -4953,7 +4953,7 @@ alter_commands: 
        ;



all_or_alt_part_name_list:

        | ALL

        ALL

        {

	  Lex->alter_info.flags|= ALTER_ALL_PARTITION;

        }