bzr push into mysql-trunk branch (raghav.kapoor:3579 to 3580) Bug#13247871

[Raghav Kapoor]

 3580 Raghav Kapoor	2011-11-09
      BUG#13247871 - ER_EVENT_CANNOT_ALTER_IN_THE_PAST HAS WRONG MESSAGE 
      
      BACKGROUND:
      ALTER EVENT, produces the *error* ER_EVENT_CANNOT_ALTER_IN_THE_PAST, 
      but the message is wrong. The message string is the exact 
      same as for the CREATE EVENT warning: "Event execution
      time is in the past and ON COMPLETION NOT PRESERVE is set.
      The event was dropped immediately after creation."
      
      FIX:
      The error message for ER_EVENT_CANNOT_ALTER_IN_THE_PAST has
      been updated and says like this 
      "Event execution time is in the past and ON COMPLETION NOT PRESERVE 
      is set.The event was not changed. Specify a time in the future."

    modified:
      mysql-test/r/events_2.result
      mysql-test/r/events_bugs.result
      sql/share/errmsg-utf8.txt
 3579 Guilhem Bichot	2011-11-08
      Fix for Bug#13357462 - "OPTIMIZER TRACE BROKE THE INFORMATION SCHEMA, CAUSES MYSQLADMIN CRASH";
      same cause/fix as bug 35997: define a dummy OPTIMIZER_TRACE table when
      the OPTIMIZER_TRACE preprocessor symbol is not defined.
      Otherwise enum_schema_tables and schema_tables[] are not in sync.
     @ sql/opt_trace.h
        Discovered something: this function is never used; it's needed only for the case
        of an I_S table which has a SHOW counterpart (see prepare_schema_table()),
        and OPTIMIZER_TRACE is not in this case.
     @ sql/opt_trace2server.cc
        Array optimizer_trace_info is needed even when the OPTIMIZER_TRACE preprocessor symbol is not defined.
        A #ifdef was useless, as it was already wrapped in an outer #ifdef for the same symbol.
     @ sql/sql_show.cc
        define a dummy OPTIMIZER_TRACE table when
        the OPTIMIZER_TRACE preprocessor symbol is not defined.

    modified:
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/sql_show.cc
=== modified file 'mysql-test/r/events_2.result'
--- a/mysql-test/r/events_2.result	2010-11-11 17:11:05 +0000
+++ b/mysql-test/r/events_2.result	2011-11-09 10:55:44 +0000
@@ -378,7 +378,7 @@ do
 select 1;
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 drop event event_35981;
 create event event_35981 on schedule every 1 hour starts current_timestamp
 on completion not preserve
@@ -399,7 +399,7 @@ Warnings:
 Note	1544	Event execution time is in the past. Event has been disabled
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion not preserve;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion preserve;
 Warnings:

=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2011-06-09 18:08:38 +0000
+++ b/mysql-test/r/events_bugs.result	2011-11-09 10:55:44 +0000
@@ -454,10 +454,10 @@ e3		+00:00	CREATE DEFINER=`root`@`localh
 The following should fail, and nothing should be altered.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' DISABLE;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
 The following should give warnings, and nothing should be created.
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00'

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-10-21 14:59:52 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-11-09 10:55:44 +0000
@@ -6076,8 +6076,8 @@ ER_EVENT_CANNOT_CREATE_IN_THE_PAST
   eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation."
   ger "Ausführungszeit des Events liegt in der Vergangenheit, und es wurde ON COMPLETION NOT PRESERVE gesetzt. Das Event wurde unmittelbar nach Erzeugung gelöscht."
 ER_EVENT_CANNOT_ALTER_IN_THE_PAST
-  eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation."
-  ger "Ausführungszeit des Events liegt in der Vergangenheit, und es wurde ON COMPLETION NOT PRESERVE gesetzt. Das Event wurde unmittelbar nach Erzeugung gelöscht."
+  eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future."
+  ger "Execution Zeitpunkt des Ereignisses in der Vergangenheit liegt, und es war NACH ABSCHLUSS Set nicht erhalten. Die Veranstaltung wurde nicht verändert. Geben Sie einen Zeitpunkt in der Zukunft."
 ER_SLAVE_INCIDENT
   eng "The incident %s occured on the master. Message: %-.64s"
   ger "Der Vorfall %s passierte auf dem Master. Meldung: %-.64s"

No bundle (reason: useless for push emails).