database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-11584: GRANT inside an SP does not work well on 2nd execution

Browse Source 
Allocate password hash in statment memory
This commit is contained in:
Oleksandr Byelkin
2016-12-21 17:41:48 +01:00
parent 143d512a22
commit 100f721c0a
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/sp.result
View File

@@ -8040,3 +8040,12 @@ v_name v_total
c 1 c 1
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-11584: GRANT inside an SP does not work well on 2nd execution
#
CREATE PROCEDURE sp1()
GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass';
CALL sp1();
CALL sp1();
drop user 'foo'@'%';
drop procedure sp1;

11
mysql-test/t/sp.test
View File

@@ -9484,3 +9484,14 @@ CALL p1();
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-11584: GRANT inside an SP does not work well on 2nd execution
--echo #
CREATE PROCEDURE sp1()
GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass';
CALL sp1();
CALL sp1();
drop user 'foo'@'%';
drop procedure sp1;

5
sql/sql_acl.cc
View File

@@ -1064,7 +1064,12 @@ static bool fix_lex_user(THD *thd, LEX_USER *user)
make_scramble= my_make_scrambled_password; make_scramble= my_make_scrambled_password;
} }
Query_arena *arena, backup;
arena= thd->activate_stmt_arena_if_needed(&backup);
char *buff= (char *) thd->alloc(scramble_length + 1); char *buff= (char *) thd->alloc(scramble_length + 1);
if (arena)
thd->restore_active_arena(arena, &backup);
if (buff == NULL) if (buff == NULL)
return true; return true;
make_scramble(buff, user->pwtext.str, user->pwtext.length); make_scramble(buff, user->pwtext.str, user->pwtext.length);