bk commit into 5.1 tree (andrey:1.2521) BUG#28310

[andrey]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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, 2007-05-29 12:44:44+02:00, andrey@stripped +2 -0
  Fix for bug #28310 Server reports events which never were created
  
  Fix a race
  
  Wait at the end of the test for all events to finish.
  Then continue to the next result. This should be done, as the
  server won't be restarted, and although events are dropped with
  drop database, they could still be executing in memory.

  mysql-test/r/events_restart_phase3.result@stripped, 2007-05-29 12:44:38+02:00, andrey@stripped +0 -6
    fix result

  mysql-test/t/events_restart_phase3.test@stripped, 2007-05-29 12:44:38+02:00, andrey@stripped +4 -2
    Fix a race
    Wait at the end of the test for all events to finish.
    Then continue to the next result. This should be done, as the
    server won't be restarted, and although events are dropped with
    drop database, they could still be executing in memory.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	whirlpool.mysql.com
# Root:	/work/mysql-5.1-runtime

--- 1.3/mysql-test/r/events_restart_phase3.result	2007-04-05 13:24:28 +02:00
+++ 1.4/mysql-test/r/events_restart_phase3.result	2007-05-29 12:44:38 +02:00
@@ -2,11 +2,5 @@
 select @@event_scheduler;
 @@event_scheduler
 ON
-"Should get 3 rows : abc1, abc2, abc3
-select distinct name from execution_log order by name;
-name
-abc1
-abc2
-abc3
 drop table execution_log;
 drop database events_test;

--- 1.2/mysql-test/t/events_restart_phase3.test	2007-04-05 13:24:29 +02:00
+++ 1.3/mysql-test/t/events_restart_phase3.test	2007-05-29 12:44:38 +02:00
@@ -11,8 +11,10 @@
 select @@event_scheduler;
 let $wait_condition=select count(distinct name)=3 from execution_log;
 --source include/wait_condition.inc
---echo "Should get 3 rows : abc1, abc2, abc3
-select distinct name from execution_log order by name;
 drop table execution_log;
 # Will drop all events
 drop database events_test;
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();