diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/events_bugs.test | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/events_bugs.test')
| -rw-r--r-- | mysql-test/t/events_bugs.test | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index df40b840a68..76288c8fbae 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -919,7 +919,6 @@ GRANT create, insert, select, event ON events_test.* TO evtest1@localhost; GRANT select,insert ON test.* TO evtest1@localhost; SHOW GRANTS FOR evtest1@localhost; ---echo connection e1; --replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK connect (e1,localhost,evtest1,ev1,events_test,$MASTER_MYPORT,$MASTER_MYSOCK); DELIMITER |; @@ -944,14 +943,13 @@ DELIMITER ;| # reasonable time like 4 seconds. Till ~ 2 seconds could pass on a heavy # loaded testing box before something gets executed). # Detection of execution is via the records inserted by the event. ---echo Sleep till the first INSERT into events_test.event_log occured +--echo Sleep till the first INSERT into events_test.event_log occurred let $wait_timeout= 4; let $wait_condition= SELECT COUNT(*) > 0 FROM events_test.event_log; --source include/wait_condition.inc SELECT COUNT(*) > 0 AS "Expect 1" FROM events_test.event_log; # ---echo connection default; connection default; DROP USER evtest1@localhost; # 2. If we meet BUG#28924 again than a server crash happens within the next @@ -1025,10 +1023,6 @@ SET GLOBAL READ_ONLY = 1; --echo ---echo # ---echo # Connection: u1_con (mysqltest_u1@localhost/events_test). ---echo # - --connect(u1_con,localhost,mysqltest_u1,,events_test) --echo @@ -1050,10 +1044,6 @@ DROP EVENT e1; # Check that the super user still can create/update/drop events. ---echo # ---echo # Connection: root_con (root@localhost/events_test). ---echo # - --connect(root_con,localhost,root,,events_test) --echo @@ -1079,10 +1069,6 @@ SET GLOBAL READ_ONLY = 0; --echo ---echo # ---echo # Connection: u1_con (mysqltest_u1@localhost/test). ---echo # - --connection u1_con --echo @@ -1101,10 +1087,6 @@ WHERE event_schema = 'events_test'; --echo ---echo # ---echo # Connection: root_con (root@localhost/events_test). ---echo # - --connection root_con --echo @@ -1170,10 +1152,6 @@ SET GLOBAL READ_ONLY = 0; --echo ---echo # ---echo # Connection: default ---echo # - --disconnect u1_con --disconnect root_con --connection default |