bk commit into 5.1 tree (konstantin:1.2221)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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.2221 06/06/27 03:38:46 konstantin@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  mysql.com:/opt/local/work/mysql-5.1-runtime

  mysql-test/t/events_stress.test
    1.6 06/06/27 03:38:38 konstantin@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.170 06/06/27 03:38:38 konstantin@stripped +0 -0
    Auto merged

# 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:	konstantin
# Host:	bodhi.netgear
# Root:	/opt/local/work/mysql-5.1-runtime/RESYNC

--- 1.5/mysql-test/t/events_stress.test	2006-06-23 11:39:58 +04:00
+++ 1.6/mysql-test/t/events_stress.test	2006-06-27 03:38:38 +04:00
@@ -6,7 +6,11 @@
 # DROP DATABASE test start (bug #16406)
 #
 CREATE DATABASE events_conn1_test2;
-CREATE TABLE events_test.fill_it(test_name varchar(20), occur datetime);
+# BUG#20676: MySQL in debug mode has a limit of 100 waiters
+# (in mysys/thr_lock.c), so use three different tables to insert into.
+CREATE TABLE events_test.fill_it1(test_name varchar(20), occur datetime);
+CREATE TABLE events_test.fill_it2(test_name varchar(20), occur datetime);
+CREATE TABLE events_test.fill_it3(test_name varchar(20), occur datetime);
 CREATE USER event_user2@localhost;
 CREATE DATABASE events_conn2_db;
 GRANT ALL ON *.* TO event_user2@localhost;
@@ -19,7 +23,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT conn2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn2_ev$1", NOW());
+  eval CREATE EVENT conn2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it1 VALUES("conn2_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -29,7 +33,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT conn3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn3_ev$1", NOW());
+  eval CREATE EVENT conn3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it1 VALUES("conn3_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -51,7 +55,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT conn1_round1_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round1_ev$1", NOW());
+  eval CREATE EVENT conn1_round1_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it2 VALUES("conn1_round1_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -68,7 +72,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT conn1_round2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round2_ev$1", NOW());
+  eval CREATE EVENT conn1_round2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it2 VALUES("conn1_round2_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -80,7 +84,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT conn1_round3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round3_ev$1", NOW());
+  eval CREATE EVENT conn1_round3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it3 VALUES("conn1_round3_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -91,7 +95,7 @@
 let $1= 50;
 while ($1)
 {
-  eval CREATE EVENT ev_round4_drop$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round4_ev$1", NOW());
+  eval CREATE EVENT ev_round4_drop$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it3 VALUES("conn1_round4_ev$1", NOW());
   dec $1;
 }
 --enable_query_log
@@ -118,7 +122,9 @@
 disconnect conn3;
 connection default;
 USE events_test;
-DROP TABLE fill_it;
+DROP TABLE fill_it1;
+DROP TABLE fill_it2;
+DROP TABLE fill_it3;
 --disable_query_log
 DROP USER event_user2@localhost;
 DROP USER event_user3@localhost;

--- 1.169/mysql-test/t/disabled.def	2006-06-22 18:59:52 +04:00
+++ 1.170/mysql-test/t/disabled.def	2006-06-27 03:38:38 +04:00
@@ -26,7 +26,6 @@
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
-rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er
 #rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
 rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked