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
c392623b
Commit
c392623b
authored
Mar 27, 2007
by
kostja@bodhi.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling (recursivity -> recursion)
parent
e5d6b0af
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
mysql-test/r/events.result
mysql-test/r/events.result
+2
-2
mysql-test/r/events_bugs.result
mysql-test/r/events_bugs.result
+1
-1
mysql-test/r/ps.result
mysql-test/r/ps.result
+1
-1
mysql-test/t/events.test
mysql-test/t/events.test
+2
-2
mysql-test/t/events_bugs.test
mysql-test/t/events_bugs.test
+1
-1
mysql-test/t/ps.test
mysql-test/t/ps.test
+1
-1
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-2
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
No files found.
mysql-test/r/events.result
View file @
c392623b
...
@@ -73,7 +73,7 @@ DROP EVENT event_starts_test;
...
@@ -73,7 +73,7 @@ DROP EVENT event_starts_test;
create table test_nested(a int);
create table test_nested(a int);
create event e_43 on schedule every 1 second do set @a = 5;
create event e_43 on schedule every 1 second do set @a = 5;
alter event e_43 do alter event e_43 do set @a = 4;
alter event e_43 do alter event e_43 do set @a = 4;
ERROR HY000: Recursi
vity
of EVENT DDL statements is forbidden when body is present
ERROR HY000: Recursi
on
of EVENT DDL statements is forbidden when body is present
alter event e_43 do
alter event e_43 do
begin
begin
alter event e_43 on schedule every 5 minute;
alter event e_43 on schedule every 5 minute;
...
@@ -367,7 +367,7 @@ root localhost events_test Connect User lock select get_lock("test_lock2_1", 20)
...
@@ -367,7 +367,7 @@ root localhost events_test Connect User lock select get_lock("test_lock2_1", 20)
drop event закачка21;
drop event закачка21;
create table t_16 (s1 int);
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;
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: Recursi
vity
of EVENT DDL statements is forbidden when body is present
ERROR HY000: Recursi
on
of EVENT DDL statements is forbidden when body is present
drop table t_16;
drop table t_16;
create event white_space
create event white_space
on schedule every 10 hour
on schedule every 10 hour
...
...
mysql-test/r/events_bugs.result
View file @
c392623b
...
@@ -17,7 +17,7 @@ DROP EVENT ДОЛЕН_регистър_утф8;
...
@@ -17,7 +17,7 @@ DROP EVENT ДОЛЕН_регистър_утф8;
SET NAMES latin1;
SET NAMES latin1;
set @a=3;
set @a=3;
CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;
CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;
ERROR HY000: Recursi
vity
of EVENT DDL statements is forbidden when body is present
ERROR HY000: Recursi
on
of EVENT DDL statements is forbidden when body is present
create event e_55 on schedule at 99990101000000 do drop table t;
create event e_55 on schedule at 99990101000000 do drop table t;
ERROR HY000: Incorrect AT value: '99990101000000'
ERROR HY000: Incorrect AT value: '99990101000000'
create event e_55 on schedule every 10 hour starts 99990101000000 do drop table t;
create event e_55 on schedule every 10 hour starts 99990101000000 do drop table t;
...
...
mysql-test/r/ps.result
View file @
c392623b
...
@@ -2285,7 +2285,7 @@ drop user pstest_xyz@localhost;
...
@@ -2285,7 +2285,7 @@ drop user pstest_xyz@localhost;
deallocate prepare abc;
deallocate prepare abc;
drop event if exists xyz;
drop event if exists xyz;
create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end|
create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end|
ERROR HY000: Recursi
vity
of EVENT DDL statements is forbidden when body is present
ERROR HY000: Recursi
on
of EVENT DDL statements is forbidden when body is present
select func_1(), func_1(), func_1() from dual;
select func_1(), func_1(), func_1() from dual;
ERROR 42000: FUNCTION test.func_1 does not exist
ERROR 42000: FUNCTION test.func_1 does not exist
drop function func_1;
drop function func_1;
...
...
mysql-test/t/events.test
View file @
c392623b
...
@@ -74,7 +74,7 @@ DROP EVENT event_starts_test;
...
@@ -74,7 +74,7 @@ DROP EVENT event_starts_test;
#
#
create
table
test_nested
(
a
int
);
create
table
test_nested
(
a
int
);
create
event
e_43
on
schedule
every
1
second
do
set
@
a
=
5
;
create
event
e_43
on
schedule
every
1
second
do
set
@
a
=
5
;
--
error
ER_EVENT_RECURSI
VITY
_FORBIDDEN
--
error
ER_EVENT_RECURSI
ON
_FORBIDDEN
alter
event
e_43
do
alter
event
e_43
do
set
@
a
=
4
;
alter
event
e_43
do
alter
event
e_43
do
set
@
a
=
4
;
delimiter
|
;
delimiter
|
;
alter
event
e_43
do
alter
event
e_43
do
...
@@ -351,7 +351,7 @@ drop event закачка21;
...
@@ -351,7 +351,7 @@ drop event закачка21;
# Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement
# Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement
#
#
create
table
t_16
(
s1
int
);
create
table
t_16
(
s1
int
);
--
error
ER_EVENT_RECURSI
VITY
_FORBIDDEN
--
error
ER_EVENT_RECURSI
ON
_FORBIDDEN
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
;
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
;
drop
table
t_16
;
#
#
...
...
mysql-test/t/events_bugs.test
View file @
c392623b
...
@@ -30,7 +30,7 @@ SET NAMES latin1;
...
@@ -30,7 +30,7 @@ SET NAMES latin1;
# START - BUG#16408: Events: crash for an event in a procedure
# START - BUG#16408: Events: crash for an event in a procedure
#
#
set
@
a
=
3
;
set
@
a
=
3
;
--
error
ER_EVENT_RECURSI
VITY
_FORBIDDEN
--
error
ER_EVENT_RECURSI
ON
_FORBIDDEN
CREATE
PROCEDURE
p_16
()
CREATE
EVENT
e_16
ON
SCHEDULE
EVERY
@
a
SECOND
DO
SET
@
a
=
5
;
CREATE
PROCEDURE
p_16
()
CREATE
EVENT
e_16
ON
SCHEDULE
EVERY
@
a
SECOND
DO
SET
@
a
=
5
;
#
#
# END - BUG#16408: Events: crash for an event in a procedure
# END - BUG#16408: Events: crash for an event in a procedure
...
...
mysql-test/t/ps.test
View file @
c392623b
...
@@ -2324,7 +2324,7 @@ drop event if exists xyz;
...
@@ -2324,7 +2324,7 @@ drop event if exists xyz;
#drop event xyz;
#drop event xyz;
#drop procedure proc_1;
#drop procedure proc_1;
delimiter |;
delimiter |;
--error ER_EVENT_RECURSI
VITY
_FORBIDDEN
--error ER_EVENT_RECURSI
ON
_FORBIDDEN
create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end|
create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end|
delimiter ;|
delimiter ;|
--error ER_SP_DOES_NOT_EXIST
--error ER_SP_DOES_NOT_EXIST
...
...
sql/share/errmsg.txt
View file @
c392623b
...
@@ -5978,8 +5978,8 @@ ER_BASE64_DECODE_ERROR
...
@@ -5978,8 +5978,8 @@ ER_BASE64_DECODE_ERROR
ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA
ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA
eng "Triggers can not be created on system tables"
eng "Triggers can not be created on system tables"
ger "Trigger knnen nicht auf Systemtabellen erzeugt werden"
ger "Trigger knnen nicht auf Systemtabellen erzeugt werden"
ER_EVENT_RECURSI
VITY
_FORBIDDEN
ER_EVENT_RECURSI
ON
_FORBIDDEN
eng "Recursi
vity
of EVENT DDL statements is forbidden when body is present"
eng "Recursi
on
of EVENT DDL statements is forbidden when body is present"
ger "Rekursivitt von EVENT-DDL-Anweisungen ist unzulssig wenn ein Hauptteil (Body) existiert"
ger "Rekursivitt von EVENT-DDL-Anweisungen ist unzulssig wenn ein Hauptteil (Body) existiert"
ER_EVENTS_DB_ERROR
ER_EVENTS_DB_ERROR
eng "Cannot proceed because system tables used by Event Scheduler were found damaged at server start"
eng "Cannot proceed because system tables used by Event Scheduler were found damaged at server start"
...
...
sql/sql_yacc.yy
View file @
c392623b
...
@@ -1847,7 +1847,7 @@ ev_sql_stmt:
...
@@ -1847,7 +1847,7 @@ ev_sql_stmt:
*/
*/
if (lex->sphead)
if (lex->sphead)
{
{
my_error(ER_EVENT_RECURSI
VITY
_FORBIDDEN, MYF(0));
my_error(ER_EVENT_RECURSI
ON
_FORBIDDEN, MYF(0));
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
...
...
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