From 2efac2246325f48efdfe08076c68774bab1c2616 Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Sun, 1 Jul 2007 11:00:29 -0700
Subject: [PATCH] Corrected a test case.

---
 mysql-test/r/events_bugs.result |  8 +++++---
 mysql-test/t/events_bugs.test   | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index c90b3a458f..5de0b841a0 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -571,11 +571,11 @@ CREATE USER evtest1@localhost;
 SET PASSWORD FOR evtest1@localhost = password('ev1');
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM evtest1@localhost;
 GRANT create, insert, select, event ON events_test.* TO evtest1@localhost;
-GRANT select,insert ON TEST.* TO evtest1@localhost;
+GRANT select,insert ON test.* TO evtest1@localhost;
 SHOW GRANTS FOR evtest1@localhost;
 Grants for evtest1@localhost
 GRANT USAGE ON *.* TO 'evtest1'@'localhost' IDENTIFIED BY PASSWORD '*3170F3644E31580C25DE4A08F4C07CC9A2D40C32'
-GRANT SELECT, INSERT ON `TEST`.* TO 'evtest1'@'localhost'
+GRANT SELECT, INSERT ON `test`.* TO 'evtest1'@'localhost'
 GRANT SELECT, INSERT, CREATE, EVENT ON `events_test`.* TO 'evtest1'@'localhost'
 connection e1;
 USE events_test;
@@ -585,13 +585,15 @@ SET AUTOCOMMIT = 0;
 SET @evname = 'ev_sched_1823';
 SET @cnt = 0;
 SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
-IF @cnt <= 6 THEN
+IF @cnt < 6 THEN
 INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
 COMMIT;
 END IF;
 SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
+IF @cnt < 6 THEN
 INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
 ROLLBACK;
+END IF;
 END;|
 connection default;
 DROP EVENT ev_sched_1823;
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
index 5e326d28ab..4186b4701f 100644
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/t/events_bugs.test
@@ -668,7 +668,7 @@ CREATE USER evtest1@localhost;
 SET PASSWORD FOR evtest1@localhost = password('ev1');
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM evtest1@localhost;
 GRANT create, insert, select, event ON events_test.* TO evtest1@localhost;
-GRANT select,insert ON TEST.* TO evtest1@localhost;
+GRANT select,insert ON test.* TO evtest1@localhost;
 SHOW GRANTS FOR evtest1@localhost;
 
 --echo connection e1;
@@ -683,13 +683,15 @@ DO BEGIN
        SET @evname = 'ev_sched_1823';
        SET @cnt = 0;
        SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
-       IF @cnt <= 6 THEN
+       IF @cnt < 6 THEN
          INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
          COMMIT;
        END IF;
        SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
-       INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
-       ROLLBACK;
+       IF @cnt < 6 THEN
+         INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
+         ROLLBACK;
+       END IF;
 END;|
 DELIMITER ;|
 
-- 
2.30.9