From fce728059116b131eebed402635210d4fe82ef1c Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.local>
Date: Tue, 27 Mar 2007 22:15:51 +0400
Subject: [PATCH] Fix spelling (recursivity -> recursion)

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.
---
 mysql-test/r/events.result      | 4 ++--
 mysql-test/r/events_bugs.result | 2 +-
 mysql-test/r/ps.result          | 2 +-
 mysql-test/t/events.test        | 4 ++--
 mysql-test/t/events_bugs.test   | 2 +-
 mysql-test/t/ps.test            | 2 +-
 sql/share/errmsg.txt            | 4 ++--
 sql/sql_yacc.yy                 | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mysql-test/r/events.result b/mysql-test/r/events.result
index 641de1571c3..b0640af0b13 100644
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events.result
@@ -73,7 +73,7 @@ DROP EVENT event_starts_test;
 create table test_nested(a int);
 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;
-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
 begin
 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;
 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: 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;
 create event white_space
 on schedule every 10 hour
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index 1a34f098b12..6835ecd7fde 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -17,7 +17,7 @@ DROP EVENT ДОЛЕН_регистър_утф8;
 SET NAMES latin1;
 set @a=3;
 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;
 ERROR HY000: Incorrect AT value: '99990101000000'
 create event e_55 on schedule every 10 hour starts 99990101000000 do drop table t;
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index c4e44945ec4..12608c48bf5 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -2285,7 +2285,7 @@ drop user pstest_xyz@localhost;
 deallocate prepare abc;
 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|
-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;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index 24f4b4eccab..39bc1063ace 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -74,7 +74,7 @@ DROP EVENT event_starts_test;
 #
 create table test_nested(a int);
 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;
 delimiter |;
 alter event e_43 do
@@ -351,7 +351,7 @@ drop event закачка21;
 # Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement
 #
 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;
 drop table t_16;
 #
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
index c1016f1752b..56c44dc3a9f 100644
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/t/events_bugs.test
@@ -30,7 +30,7 @@ SET NAMES latin1;
 # START - BUG#16408: Events: crash for an event in a procedure
 #
 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;
 #
 # END   - BUG#16408: Events: crash for an event in a procedure
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 9f670f9973f..44f9bf350b2 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -2324,7 +2324,7 @@ drop event if exists xyz;
 #drop event xyz;
 #drop procedure proc_1;
 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|
 delimiter ;|
 --error ER_SP_DOES_NOT_EXIST
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index c0da7053ac2..0a40f2b9ed1 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5978,8 +5978,8 @@ ER_BASE64_DECODE_ERROR
 ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA
         eng "Triggers can not be created on system tables"
         ger "Trigger können nicht auf Systemtabellen erzeugt werden"
-ER_EVENT_RECURSIVITY_FORBIDDEN
-        eng "Recursivity of EVENT DDL statements is forbidden when body is present"
+ER_EVENT_RECURSION_FORBIDDEN
+        eng "Recursion of EVENT DDL statements is forbidden when body is present"
         ger "Rekursivität von EVENT-DDL-Anweisungen ist unzulässig wenn ein Hauptteil (Body) existiert"
 ER_EVENTS_DB_ERROR
         eng "Cannot proceed because system tables used by Event Scheduler were found damaged at server start"
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9d4c62052dd..b8dc377bb82 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1847,7 +1847,7 @@ ev_sql_stmt:
             */
             if (lex->sphead)
             {
-              my_error(ER_EVENT_RECURSIVITY_FORBIDDEN, MYF(0));
+              my_error(ER_EVENT_RECURSION_FORBIDDEN, MYF(0));
               MYSQL_YYABORT;
             }
               
-- 
2.30.9