bk commit into 5.1 tree (knielsen:1.2210) BUG#20676

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2210 06/06/26 15:49:58 knielsen@stripped +2 -0
  BUG#20676: debug warnings about too many lock waiters cause test failure.
  
  The 250 simultaneous events all accessing the same table caused the
  events_stress test to fail due to debug warnings about too many table
  waiters. Fixed by using three different tables.

  mysql-test/t/events_stress.test
    1.5 06/06/26 15:49:54 knielsen@stripped +14 -8
    Use three different MyISAM tables to avoid debug warnings about too many
    locks.

  mysql-test/r/events_stress.result
    1.5 06/06/26 15:49:53 knielsen@stripped +6 -2
    Use three different MyISAM tables to avoid debug warnings about too many
    locks.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-pristine

--- 1.4/mysql-test/r/events_stress.result	2006-05-23 10:48:57 +02:00
+++ 1.5/mysql-test/r/events_stress.result	2006-06-26 15:49:53 +02:00
@@ -1,6 +1,8 @@
 CREATE DATABASE IF NOT EXISTS events_test;
 CREATE DATABASE events_conn1_test2;
-CREATE TABLE events_test.fill_it(test_name varchar(20), occur datetime);
+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;
@@ -57,5 +59,7 @@
 DROP DATABASE events_conn1_test4;
 SET GLOBAL event_scheduler=1;
 USE events_test;
-DROP TABLE fill_it;
+DROP TABLE fill_it1;
+DROP TABLE fill_it2;
+DROP TABLE fill_it3;
 DROP DATABASE events_test;

--- 1.4/mysql-test/t/events_stress.test	2006-05-23 12:10:00 +02:00
+++ 1.5/mysql-test/t/events_stress.test	2006-06-26 15:49:54 +02:00
@@ -3,7 +3,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;
@@ -16,7 +20,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
@@ -26,7 +30,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
@@ -48,7 +52,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
@@ -65,7 +69,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
@@ -77,7 +81,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
@@ -88,7 +92,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
@@ -115,7 +119,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;