List:Commits« Previous MessageNext Message »
From:andrey Date:May 26 2007 2:36pm
Subject:bk commit into 5.1 tree (andrey:1.2517) BUG#26338
View as plain text  
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-26 16:36:38+02:00, andrey@stripped +10 -0
  Fix for
  bug#26338 events_bugs.test fail on Debian
  and
  bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist"

  mysql-test/r/events_bugs.result@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +1 -1
    uppercase

  mysql-test/t/events.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +14 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_bugs.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +9 -1
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_grant.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +8 -2
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_logs_tests.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +6 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_scheduling.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +10 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_stress.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +1 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_time_zone.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +5 -1
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_trans.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +6 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_trans_notembedded.test@stripped, 2007-05-26 16:36:32+02:00, andrey@stripped +5 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

# 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.32/mysql-test/r/events_bugs.result	2007-05-25 14:46:18 +02:00
+++ 1.33/mysql-test/r/events_bugs.result	2007-05-26 16:36:32 +02:00
@@ -557,4 +557,4 @@
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ENDS NOW() DO SELECT 1' at line 1
 CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STARTS NOW() ENDS NOW() DO SELECT 1' at line 1
-drop database events_test;
+DROP DATABASE events_test;

--- 1.47/mysql-test/t/events.test	2007-04-05 13:36:49 +02:00
+++ 1.48/mysql-test/t/events.test	2007-05-26 16:36:32 +02:00
@@ -451,6 +451,10 @@
 --echo "Should have only our process now:"
 select /*4*/ user, host, db, command, state, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
 drop event закачка21;
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
 
 ####
 # Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement
@@ -724,5 +728,15 @@
 drop table t1|
 drop event e1|
 delimiter ;|
+
+
+# 
+# End of tests
+#
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
 
 drop database events_test;

--- 1.29/mysql-test/t/events_bugs.test	2007-05-25 14:46:18 +02:00
+++ 1.30/mysql-test/t/events_bugs.test	2007-05-26 16:36:32 +02:00
@@ -648,7 +648,15 @@
 --error ER_PARSE_ERROR
 CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1;
 
+
+
 # 
 # End of tests
 #
-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();
+--source include/wait_condition.inc
+
+DROP DATABASE events_test;

--- 1.4/mysql-test/t/events_grant.test	2006-11-02 13:51:31 +01:00
+++ 1.5/mysql-test/t/events_grant.test	2007-05-26 16:36:32 +02:00
@@ -101,8 +101,14 @@
 connection default;
 DROP USER ev_test@localhost;
 DROP DATABASE events_test2;
+
+# 
+# End of tests
 #
-## EVENTS grants test end
-#
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
 
 DROP DATABASE events_test;

--- 1.15/mysql-test/t/events_scheduling.test	2007-04-06 17:44:08 +02:00
+++ 1.16/mysql-test/t/events_scheduling.test	2007-05-26 16:36:32 +02:00
@@ -106,3 +106,13 @@
 DROP TABLE table_4;
 DROP DATABASE events_test;
 SET GLOBAL event_scheduler=OFF;
+
+# 
+# End of tests
+#
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
+

--- 1.17/mysql-test/t/events_logs_tests.test	2007-03-21 22:09:45 +01:00
+++ 1.18/mysql-test/t/events_logs_tests.test	2007-05-26 16:36:32 +02:00
@@ -107,4 +107,10 @@
 
 DROP DATABASE events_test;
 
+
 SET GLOBAL event_scheduler=off;
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc

--- 1.9/mysql-test/t/events_stress.test	2006-09-01 13:08:37 +02:00
+++ 1.10/mysql-test/t/events_stress.test	2007-05-26 16:36:32 +02:00
@@ -133,4 +133,5 @@
 #
 # DROP DATABASE test end (bug #16406)
 #
+
 DROP DATABASE events_test;

--- 1.1/mysql-test/t/events_trans_notembedded.test	2007-04-07 20:16:01 +02:00
+++ 1.2/mysql-test/t/events_trans_notembedded.test	2007-05-26 16:36:32 +02:00
@@ -57,5 +57,10 @@
 #
 # Cleanup
 #
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
+
 drop database events_test;
 

--- 1.2/mysql-test/t/events_trans.test	2007-04-07 20:16:01 +02:00
+++ 1.3/mysql-test/t/events_trans.test	2007-05-26 16:36:32 +02:00
@@ -111,5 +111,11 @@
 #
 # Cleanup
 #
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
+
 drop database events_test;
 

--- 1.2/mysql-test/t/events_time_zone.test	2007-04-05 13:24:29 +02:00
+++ 1.3/mysql-test/t/events_time_zone.test	2007-05-26 16:36:32 +02:00
@@ -288,7 +288,11 @@
 DROP DATABASE mysqltest_db1;
 --disable_query_log
 eval USE $old_db;
---enable_query_log
 
+--enable_query_log
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='mysqltest_db1' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
 
 --echo End of 5.1 tests.
Thread
bk commit into 5.1 tree (andrey:1.2517) BUG#26338andrey26 May