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
3cd6015c
Commit
3cd6015c
authored
Aug 25, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into example.com:/work/mysql-5.0-runtime
parents
1b6d9589
133d2aa5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
259 additions
and
25 deletions
+259
-25
mysql-test/r/sp-error.result
mysql-test/r/sp-error.result
+39
-0
mysql-test/r/trigger.result
mysql-test/r/trigger.result
+72
-1
mysql-test/t/sp-error.test
mysql-test/t/sp-error.test
+39
-0
mysql-test/t/trigger.test
mysql-test/t/trigger.test
+89
-1
sql/sp_head.cc
sql/sp_head.cc
+6
-0
sql/sp_head.h
sql/sp_head.h
+11
-7
sql/sql_parse.cc
sql/sql_parse.cc
+1
-5
sql/sql_yacc.yy
sql/sql_yacc.yy
+2
-11
No files found.
mysql-test/r/sp-error.result
View file @
3cd6015c
...
...
@@ -634,6 +634,45 @@ flush tables;
return 5;
end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin reset query cache;
return 1; end|
ERROR 0A000: RESET is not allowed in stored function or trigger
create function bug8409() returns int begin reset master;
return 1; end|
ERROR 0A000: RESET is not allowed in stored function or trigger
create function bug8409() returns int begin reset slave;
return 1; end|
ERROR 0A000: RESET is not allowed in stored function or trigger
create function bug8409() returns int begin flush hosts;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush privileges;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush tables with read lock;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush tables;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush logs;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush status;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush slave;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush master;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush des_key_file;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create function bug8409() returns int begin flush user_resources;
return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create procedure bug9529_901234567890123456789012345678901234567890123456789012345()
begin
end|
...
...
mysql-test/r/trigger.result
View file @
3cd6015c
...
...
@@ -626,12 +626,51 @@ Trigger Event Table Statement Timing Created sql_mode Definer
t1_bi INSERT t1 set new.a = '2004-01-00' BEFORE # root@localhost
drop table t1;
create table t1 (id int);
create trigger t1_ai after insert on t1 for each row reset query cache;
ERROR 0A000: RESET is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row reset master;
ERROR 0A000: RESET is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row reset slave;
ERROR 0A000: RESET is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush hosts;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush tables with read lock;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush logs;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush status;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush slave;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush master;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush des_key_file;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush user_resources;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush tables;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create trigger t1_ai after insert on t1 for each row flush privileges;
ERROR 0A000: FLUSH is not allowed in stored function or trigger
create procedure p1() flush tables
;
drop procedure if exists p1
;
create trigger t1_ai after insert on t1 for each row call p1();
create procedure p1() flush tables;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() reset query cache;
insert into t1 values (0);
ERROR 0A000: RESET is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() reset master;
insert into t1 values (0);
ERROR 0A000: RESET is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() reset slave;
insert into t1 values (0);
ERROR 0A000: RESET is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush hosts;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
...
...
@@ -639,6 +678,38 @@ create procedure p1() flush privileges;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush tables with read lock;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush tables;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush logs;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush status;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush slave;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush master;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush des_key_file;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
create procedure p1() flush user_resources;
insert into t1 values (0);
ERROR 0A000: FLUSH is not allowed in stored function or trigger
drop procedure p1;
drop table t1;
create table t1 (id int, data int, username varchar(16));
insert into t1 (id, data) values (1, 0);
...
...
mysql-test/t/sp-error.test
View file @
3cd6015c
...
...
@@ -899,6 +899,45 @@ begin
flush
tables
;
return
5
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
reset
query
cache
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
reset
master
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
reset
slave
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
hosts
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
privileges
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
tables
with
read
lock
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
tables
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
logs
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
status
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
slave
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
master
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
des_key_file
;
return
1
;
end
|
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
function
bug8409
()
returns
int
begin
flush
user_resources
;
return
1
;
end
|
#
...
...
mysql-test/t/trigger.test
View file @
3cd6015c
...
...
@@ -651,17 +651,105 @@ drop table t1;
# of functions and triggers.
create
table
t1
(
id
int
);
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
reset
query
cache
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
reset
master
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
reset
slave
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
hosts
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
tables
with
read
lock
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
logs
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
status
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
slave
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
master
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
des_key_file
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
user_resources
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
tables
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create
trigger
t1_ai
after
insert
on
t1
for
each
row
flush
privileges
;
create
procedure
p1
()
flush
tables
;
--
disable_warnings
drop
procedure
if
exists
p1
;
--
enable_warnings
create
trigger
t1_ai
after
insert
on
t1
for
each
row
call
p1
();
create
procedure
p1
()
flush
tables
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
reset
query
cache
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
reset
master
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
reset
slave
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
hosts
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
privileges
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
tables
with
read
lock
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
tables
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
logs
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
status
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
slave
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
master
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
des_key_file
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
create
procedure
p1
()
flush
user_resources
;
--
error
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
insert
into
t1
values
(
0
);
drop
procedure
p1
;
drop
table
t1
;
...
...
sql/sp_head.cc
View file @
3cd6015c
...
...
@@ -230,6 +230,12 @@ sp_get_flags_for_command(LEX *lex)
else
flags
=
sp_head
::
HAS_COMMIT_OR_ROLLBACK
;
break
;
case
SQLCOM_FLUSH
:
flags
=
sp_head
::
HAS_SQLCOM_FLUSH
;
break
;
case
SQLCOM_RESET
:
flags
=
sp_head
::
HAS_SQLCOM_RESET
;
break
;
case
SQLCOM_CREATE_INDEX
:
case
SQLCOM_CREATE_DB
:
case
SQLCOM_CREATE_VIEW
:
...
...
sql/sp_head.h
View file @
3cd6015c
...
...
@@ -115,7 +115,9 @@ class sp_head :private Query_arena
IS_INVOKED
=
32
,
// Is set if this sp_head is being used
HAS_SET_AUTOCOMMIT_STMT
=
64
,
// Is set if a procedure with 'set autocommit'
/* Is set if a procedure with COMMIT (implicit or explicit) | ROLLBACK */
HAS_COMMIT_OR_ROLLBACK
=
128
HAS_COMMIT_OR_ROLLBACK
=
128
,
HAS_SQLCOM_RESET
=
2048
,
HAS_SQLCOM_FLUSH
=
4096
};
/* TYPE_ENUM_FUNCTION, TYPE_ENUM_PROCEDURE or TYPE_ENUM_TRIGGER */
...
...
@@ -335,14 +337,16 @@ class sp_head :private Query_arena
my_error
(
ER_SP_NO_RETSET
,
MYF
(
0
),
where
);
else
if
(
m_flags
&
HAS_SET_AUTOCOMMIT_STMT
)
my_error
(
ER_SP_CANT_SET_AUTOCOMMIT
,
MYF
(
0
));
else
if
(
m_type
!=
TYPE_ENUM_PROCEDURE
&&
(
m_flags
&
sp_head
::
HAS_COMMIT_OR_ROLLBACK
))
{
else
if
(
m_flags
&
HAS_COMMIT_OR_ROLLBACK
)
my_error
(
ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
,
MYF
(
0
));
return
TRUE
;
}
else
if
(
m_flags
&
HAS_SQLCOM_RESET
)
my_error
(
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
,
MYF
(
0
),
"RESET"
);
else
if
(
m_flags
&
HAS_SQLCOM_FLUSH
)
my_error
(
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
,
MYF
(
0
),
"FLUSH"
);
return
test
(
m_flags
&
(
CONTAINS_DYNAMIC_SQL
|
MULTI_RESULTS
|
HAS_SET_AUTOCOMMIT_STMT
));
(
CONTAINS_DYNAMIC_SQL
|
MULTI_RESULTS
|
HAS_SET_AUTOCOMMIT_STMT
|
HAS_COMMIT_OR_ROLLBACK
|
HAS_SQLCOM_RESET
|
HAS_SQLCOM_FLUSH
));
}
#ifndef DBUG_OFF
...
...
sql/sql_parse.cc
View file @
3cd6015c
...
...
@@ -6681,11 +6681,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
select_errors
=
0
;
/* Write if more errors */
bool
tmp_write_to_binlog
=
1
;
if
(
thd
&&
thd
->
in_sub_stmt
)
{
my_error
(
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
,
MYF
(
0
),
"FLUSH"
);
return
1
;
}
DBUG_ASSERT
(
!
thd
||
!
thd
->
in_sub_stmt
);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
if
(
options
&
REFRESH_GRANT
)
...
...
sql/sql_yacc.yy
View file @
3cd6015c
...
...
@@ -6783,17 +6783,8 @@ flush:
FLUSH_SYM opt_no_write_to_binlog
{
LEX *lex=Lex;
if (lex->sphead && lex->sphead->m_type != TYPE_ENUM_PROCEDURE)
{
/*
Note that both FLUSH TABLES and FLUSH PRIVILEGES will break
execution in prelocked mode. So it is better to disable
FLUSH in stored functions and triggers completely.
*/
my_error(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, MYF(0), "FLUSH");
YYABORT;
}
lex->sql_command= SQLCOM_FLUSH; lex->type=0;
lex->sql_command= SQLCOM_FLUSH;
lex->type= 0;
lex->no_write_to_binlog= $2;
}
flush_options
...
...
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