database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix spelling (recursivity -> recursion)

Browse Source 
mysql-test/r/events.result:
  Fix spelling.
mysql-test/r/events_bugs.result:
  Fix spelling.
mysql-test/r/ps.result:
  Fix spelling.
mysql-test/t/events.test:
  Fix spelling.
mysql-test/t/events_bugs.test:
  Fix spelling.
mysql-test/t/ps.test:
  Fix spelling.
sql/sql_yacc.yy:
  Fix spelling.
sql/share/errmsg.txt:
  Fix spelling.
This commit is contained in:
unknown
2007-03-27 22:15:51 +04:00
parent 587942a792
commit fce7280591
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/events.result
View File

@ -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: Recursivity of EVENT DDL statements is forbidden when body is present ERROR HY000: Recursion 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)
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: Recursivity of EVENT DDL statements is forbidden when body is present ERROR HY000: Recursion 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

2
mysql-test/r/events_bugs.result
View File

@ -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: Recursivity of EVENT DDL statements is forbidden when body is present ERROR HY000: Recursion 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;

2
mysql-test/r/ps.result
View File

@ -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: Recursivity of EVENT DDL statements is forbidden when body is present ERROR HY000: Recursion 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;

4
mysql-test/t/events.test
View File

@ -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_RECURSIVITY_FORBIDDEN --error ER_EVENT_RECURSION_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;
# 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_RECURSIVITY_FORBIDDEN --error ER_EVENT_RECURSION_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;
# #

2
mysql-test/t/events_bugs.test
View File

@ -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_RECURSIVITY_FORBIDDEN --error ER_EVENT_RECURSION_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

2
mysql-test/t/ps.test
View File

@ -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_RECURSIVITY_FORBIDDEN --error ER_EVENT_RECURSION_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

4
sql/share/errmsg.txt
View File

@ -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 k<>nnen nicht auf Systemtabellen erzeugt werden" ger "Trigger k<>nnen nicht auf Systemtabellen erzeugt werden"
ER_EVENT_RECURSIVITY_FORBIDDEN ER_EVENT_RECURSION_FORBIDDEN
eng "Recursivity of EVENT DDL statements is forbidden when body is present" eng "Recursion of EVENT DDL statements is forbidden when body is present"
ger "Rekursivit<69>t von EVENT-DDL-Anweisungen ist unzul<75>ssig wenn ein Hauptteil (Body) existiert" ger "Rekursivit<69>t von EVENT-DDL-Anweisungen ist unzul<75>ssig 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"

2
sql/sql_yacc.yy
View File

@ -1847,7 +1847,7 @@ ev_sql_stmt:
*/ */
if (lex->sphead) if (lex->sphead)
{ {
my_error(ER_EVENT_RECURSIVITY_FORBIDDEN, MYF(0)); my_error(ER_EVENT_RECURSION_FORBIDDEN, MYF(0));
MYSQL_YYABORT; MYSQL_YYABORT;
} }