diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-25 16:58:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-25 16:58:19 +0200 |
| commit | dd25e7f0ad002c79a8d9768f9d824e79800fb88d (patch) | |
| tree | 20bed7cff87d1b29180899b5b76196b133a15c06 /mysql-test/t | |
| parent | 5569132ffebba3fd2e37964543f658ed24d8caaf (diff) | |
| download | mariadb-git-dd25e7f0ad002c79a8d9768f9d824e79800fb88d.tar.gz | |
MDEV-6601 Assertion `!thd->in_active_multi_stmt_transa ction() || thd->in_multi_stmt_transaction_mode()' failed on executing a stored procedure with commit
Don't restore the whole of thd->server_status after a routine invocation,
only restore SERVER_STATUS_CURSOR_EXISTS and SERVER_STATUS_LAST_ROW_SENT,
as --ps --embedded needs.
In particular, don't restore SERVER_STATUS_IN_TRANS.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/sp-bugs.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/sp-bugs.test b/mysql-test/t/sp-bugs.test index 67924996423..44e60bb10d0 100644 --- a/mysql-test/t/sp-bugs.test +++ b/mysql-test/t/sp-bugs.test @@ -285,3 +285,16 @@ DELIMITER ;$$ CALL test_5531(1); DROP PROCEDURE test_5531; DROP TABLE t1; + +# +# MDEV-6601 Assertion `!thd->in_active_multi_stmt_transa ction() || thd->in_multi_stmt_transaction_mode()' failed on executing a stored procedure with commit +# +delimiter |; +create procedure sp() begin + commit; +end| +delimiter ;| +start transaction; +call sp(); +drop procedure sp; + |