mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto-merge from mysql-5.1-bugteam for bug#36742.

Browse source
This commit is contained in:
Dmitry Shulga 2010-10-13 13:27:03 +07:00
commit 32658e4512
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/r/grant.result
View file

@ -1577,6 +1577,17 @@ DROP USER 'testbug'@localhost;
DROP TABLE db2.t1; DROP TABLE db2.t1;
DROP DATABASE db1; DROP DATABASE db1;
DROP DATABASE db2; DROP DATABASE db2;
#
# Bug #36742
#
grant usage on Foo.* to myuser@Localhost identified by 'foo';
grant select on Foo.* to myuser@localhost;
select host,user from mysql.user where User='myuser';
host user
localhost myuser
revoke select on Foo.* from myuser@localhost;
delete from mysql.user where User='myuser';
flush privileges;
######################################################################### #########################################################################
# #
# Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE. # Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE.

10
mysql-test/t/grant.test
View file

@ -1578,6 +1578,16 @@ DROP TABLE db2.t1;
DROP DATABASE db1; DROP DATABASE db1;
DROP DATABASE db2; DROP DATABASE db2;
--echo #
--echo # Bug #36742
--echo #
grant usage on Foo.* to myuser@Localhost identified by 'foo';
grant select on Foo.* to myuser@localhost;
select host,user from mysql.user where User='myuser';
revoke select on Foo.* from myuser@localhost;
delete from mysql.user where User='myuser';
flush privileges;
# Wait till we reached the initial number of concurrent sessions # Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc

6
sql/sql_yacc.yy
View file

@ -12334,6 +12334,12 @@ user:
system_charset_info, 0) || system_charset_info, 0) ||
check_host_name(&$$->host)) check_host_name(&$$->host))
MYSQL_YYABORT; MYSQL_YYABORT;
/*
Convert hostname part of username to lowercase.
It's OK to use in-place lowercase as long as
the character set is utf8.
*/
my_casedn_str(system_charset_info, $$->host.str);
} }
| CURRENT_USER optional_braces | CURRENT_USER optional_braces
{ {