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/r/sp-innodb.result | |
| 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/r/sp-innodb.result')
| -rw-r--r-- | mysql-test/r/sp-innodb.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/sp-innodb.result b/mysql-test/r/sp-innodb.result index b3405705698..2c3bc7dc4f3 100644 --- a/mysql-test/r/sp-innodb.result +++ b/mysql-test/r/sp-innodb.result @@ -71,6 +71,7 @@ END// # Open another connection, create and initialize a table # to be used for provoking deadlock, put a lock on the table: +connect con1,localhost,root,,; CREATE TABLE t1 (i INT) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); SET AUTOCOMMIT= 0; @@ -79,6 +80,7 @@ UPDATE t1 SET i=1 WHERE i=1; # On the default connection, do an update to provoke a # deadlock, then call the function with handler. This case # fails without the patch (with error ER_NO_SUCH_TABLE): +connection default; SET AUTOCOMMIT= 0; UPDATE t1 SET i=1 WHERE i=1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -118,6 +120,7 @@ f1(): No such table # Disconnect, drop functions and table: +disconnect con1; DROP FUNCTION f4; DROP FUNCTION f3; DROP FUNCTION f2; |