Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9ae24500
Commit
9ae24500
authored
Nov 24, 2009
by
Tatiana A. Nurnberg
Browse files
Options
Browse Files
Download
Plain Diff
auto-merge
parents
18448bc0
be04d1a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
74 additions
and
0 deletions
+74
-0
mysql-test/r/grant2.result
mysql-test/r/grant2.result
+27
-0
mysql-test/t/grant2.test
mysql-test/t/grant2.test
+35
-0
sql/sql_acl.cc
sql/sql_acl.cc
+7
-0
sql/sql_parse.cc
sql/sql_parse.cc
+5
-0
No files found.
mysql-test/r/grant2.result
View file @
9ae24500
...
...
@@ -443,3 +443,30 @@ DROP TABLE db1.t1, db1.t2;
DROP USER mysqltest1@localhost;
DROP DATABASE db1;
End of 5.0 tests
USE mysql;
SELECT LEFT(CURRENT_USER(),INSTR(CURRENT_USER(),'@')-1) INTO @u;
SELECT MID(CURRENT_USER(),INSTR(CURRENT_USER(),'@')+1) INTO @h;
SELECT password FROM user WHERE user=@u AND host=@h INTO @pwd;
SELECT user,host,password,insert_priv FROM user WHERE user=@u AND host=@h;
user host password insert_priv
root localhost Y
UPDATE user SET insert_priv='N' WHERE user=@u AND host=@h;
SELECT user,host,password,insert_priv FROM user WHERE user=@u AND host=@h;
user host password insert_priv
root localhost N
GRANT INSERT ON *.* TO CURRENT_USER();
SELECT user,host,password,insert_priv FROM user WHERE user=@u AND host=@h;
user host password insert_priv
root localhost Y
UPDATE user SET insert_priv='N' WHERE user=@u AND host=@h;
GRANT INSERT ON *.* TO CURRENT_USER() IDENTIFIED BY 'keksdose';
SELECT user,host,password,insert_priv FROM user WHERE user=@u AND host=@h;
user host password insert_priv
root localhost *0BB7188CF0DE9B403BA66E9DD810D82652D002EB Y
UPDATE user SET password=@pwd WHERE user=@u AND host=@h;
SELECT user,host,password,insert_priv FROM user WHERE user=@u AND host=@h;
user host password insert_priv
root localhost Y
FLUSH PRIVILEGES;
USE test;
End of 5.1 tests
mysql-test/t/grant2.test
View file @
9ae24500
...
...
@@ -632,5 +632,40 @@ DROP DATABASE db1;
--
echo
End
of
5.0
tests
#
# Bug #48319: Server crashes on "GRANT/REVOKE ... TO CURRENT_USER"
#
# work out who we are.
USE
mysql
;
SELECT
LEFT
(
CURRENT_USER
(),
INSTR
(
CURRENT_USER
(),
'@'
)
-
1
)
INTO
@
u
;
SELECT
MID
(
CURRENT_USER
(),
INSTR
(
CURRENT_USER
(),
'@'
)
+
1
)
INTO
@
h
;
SELECT
password
FROM
user
WHERE
user
=@
u
AND
host
=@
h
INTO
@
pwd
;
# show current privs.
SELECT
user
,
host
,
password
,
insert_priv
FROM
user
WHERE
user
=@
u
AND
host
=@
h
;
# toggle INSERT
UPDATE
user
SET
insert_priv
=
'N'
WHERE
user
=@
u
AND
host
=@
h
;
SELECT
user
,
host
,
password
,
insert_priv
FROM
user
WHERE
user
=@
u
AND
host
=@
h
;
# show that GRANT ... TO CURRENT_USER() no longer crashes
GRANT
INSERT
ON
*.*
TO
CURRENT_USER
();
SELECT
user
,
host
,
password
,
insert_priv
FROM
user
WHERE
user
=@
u
AND
host
=@
h
;
UPDATE
user
SET
insert_priv
=
'N'
WHERE
user
=@
u
AND
host
=@
h
;
# show that GRANT ... TO CURRENT_USER() IDENTIFIED BY ... works now
GRANT
INSERT
ON
*.*
TO
CURRENT_USER
()
IDENTIFIED
BY
'keksdose'
;
SELECT
user
,
host
,
password
,
insert_priv
FROM
user
WHERE
user
=@
u
AND
host
=@
h
;
UPDATE
user
SET
password
=@
pwd
WHERE
user
=@
u
AND
host
=@
h
;
SELECT
user
,
host
,
password
,
insert_priv
FROM
user
WHERE
user
=@
u
AND
host
=@
h
;
FLUSH
PRIVILEGES
;
USE
test
;
--
echo
End
of
5.1
tests
# Wait till we reached the initial number of concurrent sessions
--
source
include
/
wait_until_count_sessions
.
inc
sql/sql_acl.cc
View file @
9ae24500
...
...
@@ -3462,6 +3462,13 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
result
=
TRUE
;
continue
;
}
/*
No User, but a password?
They did GRANT ... TO CURRENT_USER() IDENTIFIED BY ... !
Get the current user, and shallow-copy the new password to them!
*/
if
(
!
tmp_Str
->
user
.
str
&&
tmp_Str
->
password
.
str
)
Str
->
password
=
tmp_Str
->
password
;
if
(
replace_user_table
(
thd
,
tables
[
0
].
table
,
*
Str
,
(
!
db
?
rights
:
0
),
revoke_grant
,
create_new_users
,
test
(
thd
->
variables
.
sql_mode
&
...
...
sql/sql_parse.cc
View file @
9ae24500
...
...
@@ -7580,6 +7580,9 @@ void get_default_definer(THD *thd, LEX_USER *definer)
definer
->
host
.
str
=
(
char
*
)
sctx
->
priv_host
;
definer
->
host
.
length
=
strlen
(
definer
->
host
.
str
);
definer
->
password
.
str
=
NULL
;
definer
->
password
.
length
=
0
;
}
...
...
@@ -7631,6 +7634,8 @@ LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name)
definer
->
user
=
*
user_name
;
definer
->
host
=
*
host_name
;
definer
->
password
.
str
=
NULL
;
definer
->
password
.
length
=
0
;
return
definer
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment