bzr commit into mysql-next-mr branch (matthias.leich:3163)

[Matthias Leich]

#At file:///work2/repo/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped

 3163 Matthias Leich	2010-07-14
      Fix the problem that the test cannot be executed twice
      (./mtr --suite=perfschema --repeat=2 selects)
      --> better cleanup

    modified:
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/t/selects.test
=== modified file 'mysql-test/suite/perfschema/r/selects.result'
--- a/mysql-test/suite/perfschema/r/selects.result	2010-05-11 10:36:37 +0000
+++ b/mysql-test/suite/perfschema/r/selects.result	2010-07-14 08:39:41 +0000
@@ -55,6 +55,7 @@ THREAD_ID	EVENT_ID
 [THREAD_ID]	[EVENT_ID]
 [THREAD_ID]	[EVENT_ID]
 [THREAD_ID]	[EVENT_ID]
+DROP EVENT IF EXISTS t_ps_event;
 CREATE EVENT t_ps_event
 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND
 DO SELECT DISTINCT EVENT_ID
@@ -63,6 +64,7 @@ JOIN performance_schema.EVENTS_WAITS_HIS
 ORDER BY EVENT_ID
 LIMIT 1;
 ALTER TABLE t1 ADD COLUMN c INT;
+DROP TRIGGER IF EXISTS t_ps_trigger;
 CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1
 FOR EACH ROW BEGIN
 SET NEW.c = (SELECT MAX(EVENT_ID)
@@ -76,6 +78,7 @@ id	c
 12	[EVENT_ID]
 13	[EVENT_ID]
 DROP TRIGGER t_ps_trigger;
+DROP PROCEDURE IF EXISTS t_ps_proc;
 CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT)
 BEGIN
 SELECT thread_id FROM performance_schema.THREADS
@@ -83,6 +86,7 @@ WHERE PROCESSLIST_ID = conid INTO pid;
 END;
 |
 CALL t_ps_proc(connection_id(), @p_id);
+DROP FUNCTION IF EXISTS t_ps_proc;
 CREATE FUNCTION t_ps_func(conid INT) RETURNS int
 BEGIN
 return (SELECT thread_id FROM performance_schema.THREADS
@@ -92,6 +96,7 @@ END;
 SELECT t_ps_func(connection_id()) = @p_id;
 t_ps_func(connection_id()) = @p_id
 1
+DROP EVENT t_ps_event;
 DROP PROCEDURE t_ps_proc;
 DROP FUNCTION t_ps_func;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/perfschema/t/selects.test'
--- a/mysql-test/suite/perfschema/t/selects.test	2010-06-15 14:23:08 +0000
+++ b/mysql-test/suite/perfschema/t/selects.test	2010-07-14 08:39:41 +0000
@@ -85,6 +85,9 @@ LIMIT 5;
 
 # EVENT
 
+--disable_warnings
+DROP EVENT IF EXISTS t_ps_event;
+--enable_warnings
 CREATE EVENT t_ps_event
 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND
 DO SELECT DISTINCT EVENT_ID
@@ -99,6 +102,9 @@ DO SELECT DISTINCT EVENT_ID
 
 ALTER TABLE t1 ADD COLUMN c INT;
 
+--disable_warnings
+DROP TRIGGER IF EXISTS t_ps_trigger;
+--enable_warnings
 delimiter |;
 
 CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1
@@ -119,6 +125,9 @@ DROP TRIGGER t_ps_trigger;
 
 # PROCEDURE
 
+--disable_warnings
+DROP PROCEDURE IF EXISTS t_ps_proc;
+--enable_warnings
 delimiter |;
 
 CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT)
@@ -135,6 +144,9 @@ CALL t_ps_proc(connection_id(), @p_id);
 
 # FUNCTION
 
+--disable_warnings
+DROP FUNCTION IF EXISTS t_ps_proc;
+--enable_warnings
 delimiter |;
 
 CREATE FUNCTION t_ps_func(conid INT) RETURNS int
@@ -149,8 +161,8 @@ delimiter ;|
 
 SELECT t_ps_func(connection_id()) = @p_id;
 
+# Clean up
+DROP EVENT t_ps_event;
 DROP PROCEDURE t_ps_proc;
 DROP FUNCTION t_ps_func;
-
-# Clean up
 DROP TABLE t1;


Attachment: [text/bzr-bundle] bzr/[e-mail]