bk commit into 5.1 tree (skozlov:1.2544)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of ksm. When ksm 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-06-05 23:59:05+04:00, skozlov@stripped +2 -0
  WL#3694, fix for events

  mysql-test/r/rpl_invoked_features.result@stripped, 2007-06-05 23:58:46+04:00,
skozlov@stripped +5 -0
    updated result

  mysql-test/t/rpl_invoked_features.test@stripped, 2007-06-05 23:58:46+04:00, skozlov@stripped
+5 -0
    updated test case

# 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:	skozlov
# Host:	virtop.localdomain
# Root:	/home/ksm/commits/nr

--- 1.2/mysql-test/r/rpl_invoked_features.result	2007-06-05 23:59:45 +04:00
+++ 1.3/mysql-test/r/rpl_invoked_features.result	2007-06-05 23:59:45 +04:00
@@ -11,6 +11,8 @@
 DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
 DROP FUNCTION IF EXISTS f2;
+DROP EVENT IF EXISTS e1;
+DROP EVENT IF EXISTS e11;
 
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b INT, c VARCHAR(64)) ENGINE=myisam;
 INSERT INTO t1 VALUES (1,1,'1');
@@ -108,6 +110,7 @@
 INSERT INTO t11 VALUES (103,103,'');
 
 SET GLOBAL EVENT_SCHEDULER = on;
+SET GLOBAL EVENT_SCHEDULER = off;
 
 SHOW TABLES LIKE 't%';
 Tables_in_test (t%)
@@ -444,3 +447,5 @@
 DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
 DROP FUNCTION IF EXISTS f2;
+DROP EVENT IF EXISTS e1;
+DROP EVENT IF EXISTS e11;

--- 1.3/mysql-test/t/rpl_invoked_features.test	2007-06-05 23:59:46 +04:00
+++ 1.4/mysql-test/t/rpl_invoked_features.test	2007-06-05 23:59:46 +04:00
@@ -32,6 +32,8 @@
 DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
 DROP FUNCTION IF EXISTS f2;
+DROP EVENT IF EXISTS e1;
+DROP EVENT IF EXISTS e11;
 --enable_warnings
 
 
@@ -178,6 +180,7 @@
 SET GLOBAL EVENT_SCHEDULER = on;
 # Wait 2 sec while events will executed
 --sleep 2
+SET GLOBAL EVENT_SCHEDULER = off;
 
 # Check original objects
 --echo
@@ -270,6 +273,8 @@
 DROP PROCEDURE IF EXISTS p11;
 DROP FUNCTION IF EXISTS f1;
 DROP FUNCTION IF EXISTS f2;
+DROP EVENT IF EXISTS e1;
+DROP EVENT IF EXISTS e11;
 --enable_warnings
 
 --sync_slave_with_master slave