diff options
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/trigger-trans.result | 5 | ||||
| -rw-r--r-- | mysql-test/main/trigger-trans.test | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mysql-test/main/trigger-trans.result b/mysql-test/main/trigger-trans.result index 24ef9a4291a..2113377b1ab 100644 --- a/mysql-test/main/trigger-trans.result +++ b/mysql-test/main/trigger-trans.result @@ -234,11 +234,12 @@ DROP TABLE t3, t2, t1; # void MDL_context::release_lock(MDL_ticket*) # CREATE TABLE t1 (id int(11)) ENGINE=InnoDB; -SET max_statement_time= 0.001; LOCK TABLES t1 WRITE; +SET max_statement_time= 0.001; CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1); -DROP TABLE t1; SET max_statement_time= default; +DROP TRIGGER IF EXISTS trg16; +DROP TABLE t1; # # End of 10.5 tests # diff --git a/mysql-test/main/trigger-trans.test b/mysql-test/main/trigger-trans.test index 378da045e0a..5d7d1f8afef 100644 --- a/mysql-test/main/trigger-trans.test +++ b/mysql-test/main/trigger-trans.test @@ -240,11 +240,17 @@ DROP TABLE t3, t2, t1; --echo # CREATE TABLE t1 (id int(11)) ENGINE=InnoDB; -SET max_statement_time= 0.001; LOCK TABLES t1 WRITE; +SET max_statement_time= 0.001; +--error 0,1969,2013 +--disable_warnings CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1); -DROP TABLE t1; +--enable_warnings SET max_statement_time= default; +--disable_warnings +DROP TRIGGER IF EXISTS trg16; +--enable_warnings +DROP TABLE t1; --echo # --echo # End of 10.5 tests |