Commit e8f8fd8d authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.1 

into  chilla.local:/home/mydev/mysql-5.1-amerge
parents 4b6e8fa6 a6edf110

mysql-test/r/ctype_ucs2_def.result

+3 −0
Original line number Diff line number Diff line 
show variables like 'collation_server';

Variable_name	Value

collation_server	ucs2_unicode_ci

show variables like "%character_set_ser%";

Variable_name	Value

character_set_server	ucs2

mysql-test/r/information_schema.result

+9 −9
Original line number Diff line number Diff line
@@ -386,11 +386,11 @@ show keys from v4; 
Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

select * from information_schema.views where TABLE_NAME like "v%";

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO	root@localhost	DEFINER

NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO	root@localhost	DEFINER

NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO	root@localhost	DEFINER

NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO	root@localhost	DEFINER

NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO	root@localhost	DEFINER

NULL	test	v0	/* ALGORITHM=UNDEFINED */ select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO	root@localhost	DEFINER

NULL	test	v1	/* ALGORITHM=UNDEFINED */ select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO	root@localhost	DEFINER

NULL	test	v2	/* ALGORITHM=UNDEFINED */ select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO	root@localhost	DEFINER

NULL	test	v3	/* ALGORITHM=UNDEFINED */ select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO	root@localhost	DEFINER

NULL	test	v4	/* ALGORITHM=UNDEFINED */ select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO	root@localhost	DEFINER

drop view v0, v1, v2, v3, v4;

create table t1 (a int);

grant select,update,insert on t1 to mysqltest_1@localhost;
@@ -483,9 +483,9 @@ create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION; 
create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;

select * from information_schema.views;

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v1	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhost	DEFINER

NULL	test	v2	select `test`.`t1`.`a` AS `c` from `test`.`t1`	LOCAL	YES	root@localhost	DEFINER

NULL	test	v3	select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhost	DEFINER

NULL	test	v1	/* ALGORITHM=UNDEFINED */ select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhost	DEFINER

NULL	test	v2	/* ALGORITHM=UNDEFINED */ select `test`.`t1`.`a` AS `c` from `test`.`t1`	LOCAL	YES	root@localhost	DEFINER

NULL	test	v3	/* ALGORITHM=UNDEFINED */ select `test`.`t1`.`a` AS `c` from `test`.`t1`	CASCADED	YES	root@localhost	DEFINER

grant select (a) on test.t1 to joe@localhost with grant option;

select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -1169,7 +1169,7 @@ select * from information_schema.views 
where table_name='v1' or table_name='v2';

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v1		NONE	YES	root@localhost	DEFINER

NULL	test	v2	select 1 AS `1`	NONE	NO	mysqltest_1@localhost	DEFINER

NULL	test	v2	/* ALGORITHM=UNDEFINED */ select 1 AS `1`	NONE	NO	mysqltest_1@localhost	DEFINER

drop view v1, v2;

drop table t1;

drop user mysqltest_1@localhost;

mysql-test/r/sp-security.result

+31 −0
Original line number Diff line number Diff line
@@ -420,3 +420,34 @@ ERROR HY000: There is no 'mysqltest_1'@'localhost' registered 
---> connection: root

DROP USER mysqltest_2@localhost;

DROP DATABASE mysqltest;

GRANT USAGE ON *.* TO user19857@localhost IDENTIFIED BY 'meow';

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE ROUTINE, ALTER ROUTINE ON test.* TO

user19857@localhost;

SELECT Host,User,Password FROM mysql.user WHERE User='user19857';

Host	User	Password

localhost	user19857	*82DC221D557298F6CE9961037DB1C90604792F5C



---> connection: mysqltest_2_con

use test;

CREATE PROCEDURE sp19857() DETERMINISTIC

BEGIN

DECLARE a INT;

SET a=1;

SELECT a;

END //

SHOW CREATE PROCEDURE test.sp19857;

Procedure	sql_mode	Create Procedure

sp19857		CREATE DEFINER=`user19857`@`localhost` PROCEDURE `sp19857`()

    DETERMINISTIC

BEGIN

DECLARE a INT;

SET a=1;

SELECT a;

END

DROP PROCEDURE IF EXISTS test.sp19857;



---> connection: root

SELECT Host,User,Password FROM mysql.user WHERE User='user19857';

Host	User	Password

localhost	user19857	*82DC221D557298F6CE9961037DB1C90604792F5C

DROP USER user19857@localhost;

mysql-test/r/variables.result

+22 −0
Original line number Diff line number Diff line
@@ -421,6 +421,28 @@ set tmp_table_size=100; 
set tx_isolation="READ-COMMITTED";

set wait_timeout=100;

set log_warnings=1;

select @@session.insert_id;

@@session.insert_id

1

set @save_insert_id=@@session.insert_id;

set session insert_id=20;

select @@session.insert_id;

@@session.insert_id

20

set session last_insert_id=100;

select @@session.insert_id;

@@session.insert_id

20

select @@session.last_insert_id;

@@session.last_insert_id

100

select @@session.insert_id;

@@session.insert_id

20

set @@session.insert_id=@save_insert_id;

select @@session.insert_id;

@@session.insert_id

1

create table t1 (a int not null auto_increment, primary key(a));

create table t2 (a int not null auto_increment, primary key(a));

insert into t1 values(null),(null),(null);

mysql-test/t/ctype_ucs2_def-master.opt

+1 −1
Original line number Diff line number Diff line 
--default-character-set=ucs2 --default-collation=ucs2_unicode_ci
 
--default-collation=ucs2_unicode_ci --default-character-set=ucs2