Commit c68b0445 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
parents cd47cb56 5eaf65ab

mysql-test/r/alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ create database mysqltest; 
create table mysqltest.t1 (a int,b int,c int);

grant all on mysqltest.t1 to mysqltest_1@localhost;

alter table t1 rename t2;

ERROR 42000: insert command denied to user 'mysqltest_1'@'localhost' for table 't2'

ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'

revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;

delete from mysql.user where user=_binary'mysqltest_1';

drop database mysqltest;

mysql-test/r/grant2.result

+14 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ show grants for current_user(); 
Grants for mysqltest_1@localhost

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

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

use mysqltest;

insert into t1 values (1, 'I can''t change it!');

update t1 set data='I can change it!' where id = 1;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest'
@@ -47,8 +46,20 @@ select * from t1; 
id	data

1	I can't change it!

drop table t1;

drop database mysqltest;

use test;

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

flush privileges;

create table t1 (a int, b int);

grant select (a) on t1 to mysqltest_1@localhost with grant option;

grant select (a,b) on t1 to mysqltest_2@localhost;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'

grant select on t1 to mysqltest_3@localhost;

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

drop table t1;

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

delete from mysql.tables_priv where user like 'mysqltest\_%';

delete from mysql.columns_priv where user like 'mysqltest\_%';

flush privileges;

drop database mysqltest;

use test;

mysql-test/r/grant_cache.result

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ a b c a 
1	1	1	test.t1

2	2	2	test.t1

select * from t2;

ERROR 42000: select command denied to user 'mysqltest_2'@'localhost' for table 't2'

ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	6
@@ -148,7 +148,7 @@ select "user3"; 
user3

user3

select * from t1;

ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for column 'b' in table 't1'

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'b' in table 't1'

select a from t1;

a

1
@@ -156,7 +156,7 @@ a 
select c from t1;

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'

select * from t2;

ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for table 't2'

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't2'

select mysqltest.t1.c from test.t1,mysqltest.t1;

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'

show status like "Qcache_queries_in_cache";

mysql-test/r/ps_1general.result

+2 −2
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ execute s_t9 ; 
my_col

1

select a as my_col from t1;

ERROR 42000: select command denied to user 'second_user'@'localhost' for table 't1'

ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'

grant select on mysqltest.t1 to second_user@localhost

identified by 'looser' ;

show grants for second_user@localhost ;
@@ -873,7 +873,7 @@ Grants for second_user@localhost 
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'

GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'

execute s_t1 ;

ERROR 42000: select command denied to user 'second_user'@'localhost' for table 't1'

ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'

revoke all privileges, grant option from second_user@localhost ;

show grants for second_user@localhost ;

Grants for second_user@localhost

mysql-test/r/timezone2.result

+2 −2
Original line number Diff line number Diff line
@@ -295,9 +295,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC') 
update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')

where t1.a = t2.c and t2.d = (select max(d) from t2);

select * from mysql.time_zone_name;

ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;

ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

delete from mysql.tables_priv where user like 'mysqltest\_%';