Commit 6d05e1b6 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents f9c9db8e 087cae1a

mysql-test/r/partition.result

+17 −0
Original line number Diff line number Diff line
@@ -839,6 +839,23 @@ 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 `s1 s2` values in (0));

drop table t1;

create table t1 (a int)

partition by list (a)

(partition `7` values in (0));

drop table t1;

create table t1 (a int)

partition by list (a)

(partition `s1 s2 ` values in (0));

ERROR HY000: Incorrect partition name

create table t1 (a int)

partition by list (a)

subpartition by hash (a)

(partition p1 values in (0) (subpartition `p1 p2 `));

ERROR HY000: Incorrect partition name

CREATE TABLE t1 (a int)

PARTITION BY LIST (a)

(PARTITION p0 VALUES IN (NULL));

mysql-test/r/partition_grant.result

0 → 100644
+23 −0
Original line number Diff line number Diff line 
drop schema if exists mysqltest_1;

create schema mysqltest_1;

use mysqltest_1;

create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));

insert into t1 values (1),(2);

grant select,alter on mysqltest_1.* to mysqltest_1@localhost;

show grants for current_user;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT SELECT, ALTER ON `mysqltest_1`.* TO 'mysqltest_1'@'localhost'

alter table t1 add b int;

alter table t1 drop partition p2;

ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'

grant drop on mysqltest_1.* to mysqltest_1@localhost;

alter table t1 drop partition p2;

revoke alter on mysqltest_1.* from mysqltest_1@localhost;

alter table t1 drop partition p3;

ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'

revoke select,alter,drop on mysqltest_1.* from mysqltest_1@localhost;

drop user mysqltest_1@localhost;

drop table t1;

drop schema mysqltest_1;

End of 5.1 tests

mysql-test/t/insert.test

+1 −0
Original line number Diff line number Diff line
@@ -175,3 +175,4 @@ select count(*) from t2; 
insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;

select count(*) from t2;

drop table t1,t2,t3;

mysql-test/t/partition.test

+24 −0
Original line number Diff line number Diff line
@@ -956,6 +956,30 @@ PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM); 
SHOW TABLE STATUS;

DROP TABLE t1;



#

#BUG 18750 Problems with partition names

#

create table t1 (a int)

partition by list (a)

(partition `s1 s2` values in (0));

drop table t1;



create table t1 (a int)

partition by list (a)

(partition `7` values in (0));

drop table t1;



--error ER_WRONG_PARTITION_NAME

create table t1 (a int)

partition by list (a)

(partition `s1 s2 ` values in (0));



--error ER_WRONG_PARTITION_NAME

create table t1 (a int)

partition by list (a)

subpartition by hash (a)

(partition p1 values in (0) (subpartition `p1 p2 `));



#

# BUG 18752 SHOW CREATE TABLE doesn't show NULL value in SHOW CREATE TABLE

#

mysql-test/t/partition_grant.test

0 → 100644
+51 −0
Original line number Diff line number Diff line 
-- source include/have_partition.inc

# Grant tests not performed with embedded server

-- source include/not_embedded.inc



--disable_warnings

drop schema if exists mysqltest_1;

--enable_warnings





#

# Bug #17139: ALTER TABLE ... DROP PARTITION should require DROP privilege

#



create schema mysqltest_1;

use mysqltest_1;



create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));

insert into t1 values (1),(2);



grant select,alter on mysqltest_1.* to mysqltest_1@localhost;



connect (conn1,localhost,mysqltest_1,,mysqltest_1);

show grants for current_user;

alter table t1 add b int;

--error ER_TABLEACCESS_DENIED_ERROR

alter table t1 drop partition p2;

disconnect conn1;



connection default;

grant drop on mysqltest_1.* to mysqltest_1@localhost;



connect (conn2,localhost,mysqltest_1,,mysqltest_1);

alter table t1 drop partition p2;

disconnect conn2;



connection default;

revoke alter on mysqltest_1.* from mysqltest_1@localhost;



connect (conn3,localhost,mysqltest_1,,mysqltest_1);

--error ER_TABLEACCESS_DENIED_ERROR

alter table t1 drop partition p3;

disconnect conn3;



connection default;



revoke select,alter,drop on mysqltest_1.* from mysqltest_1@localhost;

drop user mysqltest_1@localhost;

drop table t1;

drop schema mysqltest_1;



--echo End of 5.1 tests