bk commit into 5.1 tree (hhunger:1.2537) BUG#32664

[horst]

Below is the list of changes that have just been committed into a local
5.1 repository of hhunger.  When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-22 21:28:59+01:00, hhunger@stripped +2 -0
  Inserted changes from the review of bug#32664.

  mysql-test/t/events_1.test@stripped, 2008-02-22 21:28:56+01:00, hhunger@stripped +2 -1
    Inserted changes from the review of bug#32664.

  mysql-test/t/events_2.test@stripped, 2008-02-22 21:28:56+01:00, hhunger@stripped +2 -2
    Inserted changes from the review of bug#32664.

diff -Nrup a/mysql-test/t/events_1.test b/mysql-test/t/events_1.test
--- a/mysql-test/t/events_1.test	2008-02-22 13:54:47 +01:00
+++ b/mysql-test/t/events_1.test	2008-02-22 21:28:56 +01:00
@@ -124,6 +124,8 @@ drop event existant;
 create table t_event3 (a int, b float);
 drop event if exists event3;
 create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
+let $wait_condition=SELECT count(*)=0 from t_event3;
+--source include/wait_condition.inc
 select count(*) from t_event3;
 drop event event3;
 drop table t_event3;
@@ -308,7 +310,6 @@ SELECT event_name FROM INFORMATION_SCHEM
 SHOW CREATE EVENT intact_check;
 --error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT no_such_event;
-#--error ER_CANNOT_LOAD_FROM_TABLE peplaced by:
 --error ER_EVENT_STORE_FAILED
 CREATE EVENT intact_check_1 ON SCHEDULE EVERY 5 HOUR DO SELECT 5;
 --error ER_EVENT_DOES_NOT_EXIST
diff -Nrup a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test
--- a/mysql-test/t/events_2.test	2008-02-22 13:54:47 +01:00
+++ b/mysql-test/t/events_2.test	2008-02-22 21:28:56 +01:00
@@ -196,9 +196,9 @@ drop event e1;
 # Test wrong syntax
 #
 
---error 1102
+--error ER_WRONG_DB_NAME 
 SHOW EVENTS FROM aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
---error 1102
+--error ER_WRONG_DB_NAME
 SHOW EVENTS FROM ``;
 
 SHOW EVENTS FROM `events\\test`;