summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-04-04 13:10:13 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-04-04 15:35:22 +0100
commit370886a9e247d8151dfe340a5e7b8b6929ccfacb (patch)
tree2b6544a6d6295905080cfcb851b28b785660b9e0 /mysql-test
parentf2d549d8dbda1906b3e5ae0c2fa5589f2b9de662 (diff)
downloadmariadb-git-370886a9e247d8151dfe340a5e7b8b6929ccfacb.tar.gz
MDEV-17610 Unexpected connection abort after certain operations from within stored procedure
Always set SERVER_MORE_RESULTS_EXIST when executing stored procedure statements If statements produce a result, EOF packet needs this flag (SP ends with an OK packet). IF statetement does not produce a result, affected rows count are part of the final OK packet.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/sp.result16
-rw-r--r--mysql-test/t/sp.test10
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 52b52fbbd24..dcf13e8bc4c 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -8106,3 +8106,19 @@ DROP PROCEDURE sp;
DROP VIEW v1;
DROP TABLE t1, t2;
# End of 5.5 test
+CREATE PROCEDURE sp() ALTER TABLE non_existing_table OPTIMIZE PARTITION p0;
+CALL sp;
+Table Op Msg_type Msg_text
+test.non_existing_table optimize Error Table 'test.non_existing_table' doesn't exist
+test.non_existing_table optimize status Operation failed
+SELECT 1;
+1
+1
+DROP PROCEDURE sp;
+CREATE PROCEDURE sp() SHOW USER_STATISTICS;
+CALL sp;
+User Total_connections Concurrent_connections Connected_time Busy_time Cpu_time Bytes_received Bytes_sent Binlog_bytes_written Rows_read Rows_sent Rows_deleted Rows_inserted Rows_updated Select_commands Update_commands Other_commands Commit_transactions Rollback_transactions Denied_connections Lost_connections Access_denied Empty_queries
+SELECT 1;
+1
+1
+DROP PROCEDURE sp;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index fb9da936fdb..58bffab462d 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -9416,3 +9416,13 @@ DROP VIEW v1;
DROP TABLE t1, t2;
--echo # End of 5.5 test
+
+#MDEV-17610
+CREATE PROCEDURE sp() ALTER TABLE non_existing_table OPTIMIZE PARTITION p0;
+CALL sp;
+SELECT 1;
+DROP PROCEDURE sp;
+CREATE PROCEDURE sp() SHOW USER_STATISTICS;
+CALL sp;
+SELECT 1;
+DROP PROCEDURE sp;