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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c5895a96
Commit
c5895a96
authored
Mar 09, 2006
by
anozdrin@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After-merge fixes.
parent
c1ef46fc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
20 deletions
+15
-20
mysql-test/r/trigger-grant.result
mysql-test/r/trigger-grant.result
+1
-0
mysql-test/r/view_grant.result
mysql-test/r/view_grant.result
+8
-3
mysql-test/t/trigger-grant.test
mysql-test/t/trigger-grant.test
+1
-4
mysql-test/t/view_grant.test
mysql-test/t/view_grant.test
+3
-2
sql/sql_parse.cc
sql/sql_parse.cc
+1
-10
sql/sql_show.cc
sql/sql_show.cc
+1
-1
No files found.
mysql-test/r/trigger-grant.result
View file @
c5895a96
...
...
@@ -135,6 +135,7 @@ SET @new_sum = 0;
Warnings:
Note 1449 There is no 'mysqltest_nonexs'@'localhost' registered
INSERT INTO t1 VALUES(6);
ERROR HY000: There is no 'mysqltest_nonexs'@'localhost' registered
SHOW TRIGGERS;
Trigger Event Table Statement Timing Created sql_mode Definer
trg1 INSERT t1 SET @new_sum = 0 BEFORE NULL mysqltest_inv@localhost
...
...
mysql-test/r/view_grant.result
View file @
c5895a96
...
...
@@ -522,11 +522,16 @@ use test;
drop user mysqltest_1@localhost;
drop database mysqltest;
create definer=some_user@`` sql security invoker view v1 as select 1;
ERROR HY000: Definer is not fully qualified
create definer=some_user@localhost sql security invoker view v1 as select 1;
Warnings:
Note 1449 There is no 'some_user'@'' registered
create definer=some_user@localhost sql security invoker view v2 as select 1;
Warnings:
Note 1449 There is no 'some_user'@'localhost' registered
show create view v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`some_user`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select 1 AS `1`
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`some_user`@`` SQL SECURITY INVOKER VIEW `v1` AS select 1 AS `1`
show create view v2;
View Create View
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`some_user`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select 1 AS `1`
drop view v1;
drop view v2;
mysql-test/t/trigger-grant.test
View file @
c5895a96
...
...
@@ -317,10 +317,7 @@ CREATE DEFINER='mysqltest_nonexs'@'localhost'
# Check that trg2 will not be activated.
# --error ER_SPECIFIC_ACCESS_DENIED_ERROR
#
# TODO: Due to the BUG#13198(SP executes if definer does not exist) the
# following statement does not fail as it should.
--
error
ER_NO_SUCH_USER
INSERT
INTO
t1
VALUES
(
6
);
#
...
...
mysql-test/t/view_grant.test
View file @
c5895a96
...
...
@@ -712,10 +712,11 @@ connection default;
#
# DEFINER information check
#
--
error
ER_MALFORMED_DEFINER
create
definer
=
some_user
@
``
sql
security
invoker
view
v1
as
select
1
;
create
definer
=
some_user
@
localhost
sql
security
invoker
view
v
1
as
select
1
;
create
definer
=
some_user
@
localhost
sql
security
invoker
view
v
2
as
select
1
;
show
create
view
v1
;
show
create
view
v2
;
drop
view
v1
;
drop
view
v2
;
sql/sql_parse.cc
View file @
c5895a96
...
...
@@ -7475,8 +7475,7 @@ LEX_USER *create_default_definer(THD *thd)
/*
Create definer with the given user and host names. Also check that the user
and host names satisfy definers requirements.
Create definer with the given user and host names.
SYNOPSIS
create_definer()
...
...
@@ -7494,14 +7493,6 @@ LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name)
{
LEX_USER
*
definer
;
/* Check that specified host name is valid. */
if
(
host_name
->
length
==
0
)
{
my_error
(
ER_MALFORMED_DEFINER
,
MYF
(
0
));
return
0
;
}
/* Create and initialize. */
if
(
!
(
definer
=
(
LEX_USER
*
)
thd
->
alloc
(
sizeof
(
LEX_USER
))))
...
...
sql/sql_show.cc
View file @
c5895a96
...
...
@@ -831,7 +831,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
int
get_quote_char_for_identifier
(
THD
*
thd
,
const
char
*
name
,
uint
length
)
{
if
(
!
length
||
if
(
length
&&
!
is_keyword
(
name
,
length
)
&&
!
require_quotes
(
name
,
length
)
&&
!
(
thd
->
options
&
OPTION_QUOTE_SHOW_CREATE
))
...
...
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