From 60b75a3a02e41a28c584ccce389597763be5cf21 Mon Sep 17 00:00:00 2001 From: "andrey@lmy004." <> Date: Tue, 23 May 2006 10:49:09 +0200 Subject: [PATCH 1/3] make it less stressful. some pushbuild boxes cannot cope with it --- mysql-test/r/events_stress.result | 8 ++++---- mysql-test/t/events_stress.test | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/events_stress.result b/mysql-test/r/events_stress.result index a903a4502bf..ead618e8136 100644 --- a/mysql-test/r/events_stress.result +++ b/mysql-test/r/events_stress.result @@ -16,7 +16,7 @@ CREATE EVENT ev_drop3 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1; USE events_test; SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS; COUNT(*) -203 +103 SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2'; COUNT(*) 3 @@ -29,7 +29,7 @@ CREATE DATABASE events_conn1_test2; USE events_conn1_test2; SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2'; COUNT(*) -100 +50 SET GLOBAL event_scheduler=1; DROP DATABASE events_conn1_test2; SET GLOBAL event_scheduler=2; @@ -41,14 +41,14 @@ USE events_conn1_test3; SET GLOBAL event_scheduler=1; SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test3'; COUNT(*) -100 +50 CREATE DATABASE events_conn1_test4; USE events_conn1_test4; CREATE DATABASE events_conn1_test2; USE events_conn1_test2; SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2'; COUNT(*) -100 +50 DROP DATABASE events_conn2_db; DROP DATABASE events_conn3_db; DROP DATABASE events_conn1_test2; diff --git a/mysql-test/t/events_stress.test b/mysql-test/t/events_stress.test index 24bb5bc89b1..ab6da98ba28 100644 --- a/mysql-test/t/events_stress.test +++ b/mysql-test/t/events_stress.test @@ -13,7 +13,7 @@ GRANT ALL ON *.* TO event_user3@localhost; connect (conn2,localhost,event_user2,,events_conn2_db); --echo "In the second connection we create some events which won't be dropped till the end" --disable_query_log -let $1= 100; +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()); @@ -23,7 +23,7 @@ while ($1) connect (conn3,localhost,event_user3,,events_conn3_db); --echo "In the second connection we create some events which won't be dropped till the end" --disable_query_log -let $1= 100; +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()); @@ -45,7 +45,7 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_ CREATE DATABASE events_conn1_test2; USE events_conn1_test2; --disable_query_log -let $1= 100; +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()); @@ -62,7 +62,7 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_ CREATE DATABASE events_conn1_test3; USE events_conn1_test3; --disable_query_log -let $1= 100; +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()); @@ -74,7 +74,7 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_ CREATE DATABASE events_conn1_test4; USE events_conn1_test4; --disable_query_log -let $1= 100; +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()); @@ -85,7 +85,7 @@ while ($1) CREATE DATABASE events_conn1_test2; USE events_conn1_test2; --disable_query_log -let $1= 100; +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()); From f234eef13b0ed876b49d9c1838d5d8ec0067ed95 Mon Sep 17 00:00:00 2001 From: "andrey@lmy004." <> Date: Tue, 23 May 2006 12:10:07 +0200 Subject: [PATCH 2/3] update result drop users at the end of events_stress --- mysql-test/r/ps_1general.result | 2 +- mysql-test/r/skip_name_resolve.result | 1 + mysql-test/r/sp_notembedded.result | 2 ++ mysql-test/r/status.result | 10 +++++----- mysql-test/t/events_stress.test | 4 ++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index d0b773dfe34..1a1d6432411 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -299,7 +299,7 @@ t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL prepare stmt4 from ' show status like ''Threads_running'' '; execute stmt4; Variable_name Value -Threads_running 1 +Threads_running 2 prepare stmt4 from ' show variables like ''sql_mode'' '; execute stmt4; Variable_name Value diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result index 8ef52e75238..855876825ad 100644 --- a/mysql-test/r/skip_name_resolve.result +++ b/mysql-test/r/skip_name_resolve.result @@ -10,5 +10,6 @@ user() # show processlist; Id User Host db Command Time State Info + event_scheduler NULL