bk commit into 5.1 tree (andrey:1.2225) BUG#20624

[ahristov]

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
  1.2225 06/07/04 17:30:39 andrey@lmy004. +3 -0
  fix test. this should remove the problem of 
  fix for bug#20624  events_logs_tests.test fails randomly

  mysql-test/t/events_logs_tests.test
    1.11 06/07/04 17:30:31 andrey@lmy004. +1 -1
    fix test. this should remove the problem of 
    Bug #20624  events_logs_tests.test fails randomly

  mysql-test/r/events_logs_tests.result
    1.11 06/07/04 17:30:31 andrey@lmy004. +1 -1
    update result

  BitKeeper/etc/ignore
    1.247 06/07/04 17:30:31 andrey@lmy004. +1 -0
    Added server-tools/instance-manager/net_serv.cc to the ignore list

# 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:	lmy004.
# Root:	/work/mysql-5.1-runtime-20624

--- 1.10/mysql-test/r/events_logs_tests.result	2006-06-22 16:13:09 +02:00
+++ 1.11/mysql-test/r/events_logs_tests.result	2006-07-04 17:30:31 +02:00
@@ -49,8 +49,8 @@ USER_HOST	SLEEPVAL	events_test	SELECT SL
 SET SESSION long_query_time=300;
 "Make it quite long"
 TRUNCATE mysql.slow_log;
-SET SESSION long_query_time=1;
 CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);
+SET SESSION long_query_time=1;
 "This won't go to the slow log"
 CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);
 SELECT * FROM slow_event_test;

--- 1.10/mysql-test/t/events_logs_tests.test	2006-06-23 09:39:58 +02:00
+++ 1.11/mysql-test/t/events_logs_tests.test	2006-07-04 17:30:31 +02:00
@@ -69,8 +69,8 @@ SELECT user_host, query_time, db, sql_te
 SET SESSION long_query_time=300;
 --echo "Make it quite long"
 TRUNCATE mysql.slow_log;
-SET SESSION long_query_time=1;
 CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);
+SET SESSION long_query_time=1;
 --echo "This won't go to the slow log"
 CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);
 SELECT * FROM slow_event_test;

--- 1.246/BitKeeper/etc/ignore	2006-06-20 17:09:11 +02:00
+++ 1.247/BitKeeper/etc/ignore	2006-07-04 17:30:31 +02:00
@@ -1778,3 +1778,4 @@ vio/viotest-sslconnect.cpp
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
+server-tools/instance-manager/net_serv.cc