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
32ae54bd
Commit
32ae54bd
authored
18 years ago
by
andrey@lmy004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement)
WL#1034 (Internal CRON) (post-post-review updates)
parent
3195aef7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
0 deletions
+24
-0
mysql-test/r/events.result
mysql-test/r/events.result
+4
-0
mysql-test/t/events.test
mysql-test/t/events.test
+11
-0
sql/sp_head.cc
sql/sp_head.cc
+3
-0
sql/sql_parse.cc
sql/sql_parse.cc
+6
-0
No files found.
mysql-test/r/events.result
View file @
32ae54bd
...
...
@@ -361,4 +361,8 @@ show processlist;
Id User Host db Command Time State Info
# root localhost events_test Query # NULL show processlist
drop event закачка21;
create table t_16 (s1 int);
create trigger t_16_bi before insert on t_16 for each row create event e_16 on schedule every 1 second do set @a=5;
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
drop table t_16;
drop database events_test;
This diff is collapsed.
Click to expand it.
mysql-test/t/events.test
View file @
32ae54bd
...
...
@@ -323,6 +323,17 @@ select release_lock("test_lock2_1");
show
processlist
;
drop
event
Ð
·
Ð
°
кÐ
°
Ñ
‡
кÐ
°
21
;
####
# Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement
#
create
table
t_16
(
s1
int
);
--
error
1422
create
trigger
t_16_bi
before
insert
on
t_16
for
each
row
create
event
e_16
on
schedule
every
1
second
do
set
@
a
=
5
;
drop
table
t_16
;
#
# end of test case
####
##set global event_scheduler=1;
##select get_lock("test_lock3", 20);
##create event закачка on schedule every 10 hour do select get_lock("test_lock3", 20);
...
...
This diff is collapsed.
Click to expand it.
sql/sp_head.cc
View file @
32ae54bd
...
...
@@ -255,6 +255,9 @@ sp_get_flags_for_command(LEX *lex)
case
SQLCOM_ALTER_FUNCTION
:
case
SQLCOM_DROP_PROCEDURE
:
case
SQLCOM_DROP_FUNCTION
:
case
SQLCOM_CREATE_EVENT
:
case
SQLCOM_ALTER_EVENT
:
case
SQLCOM_DROP_EVENT
:
flags
=
sp_head
::
HAS_COMMIT_OR_ROLLBACK
;
break
;
default:
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
32ae54bd
...
...
@@ -3773,6 +3773,12 @@ mysql_execute_command(THD *thd)
is_schema_db
(
lex
->
et
->
dbname
.
str
)))
break
;
if
(
end_active_trans
(
thd
))
{
res
=
-
1
;
break
;
}
switch
(
lex
->
sql_command
)
{
case
SQLCOM_CREATE_EVENT
:
res
=
evex_create_event
(
thd
,
lex
->
et
,
(
uint
)
lex
->
create_info
.
options
,
...
...
This diff is collapsed.
Click to expand it.
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