mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
Undid amendment allowing pending reap after switching connections Moved check for pending reap earlier; failed if running with ps-protocol
This commit is contained in:
@@ -542,13 +542,6 @@ f1
|
||||
Abcd
|
||||
mysqltest: At line 2: Cannot run query on connection between send and reap
|
||||
select * from t1;;
|
||||
select * from t1;;
|
||||
select 1;
|
||||
1
|
||||
1
|
||||
select 2;
|
||||
2
|
||||
2
|
||||
drop table t1;
|
||||
mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
|
||||
mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'
|
||||
|
@@ -78,6 +78,7 @@ COMMIT;
|
||||
|
||||
--echo 'CONNECTION con2'
|
||||
CONNECTION con2;
|
||||
reap;
|
||||
UNLOCK tables;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
@@ -127,6 +127,7 @@ connection con0;
|
||||
SET SESSION low_priority_updates = OFF;
|
||||
--echo ** Connection con1 **
|
||||
connection con1;
|
||||
reap;
|
||||
SET SESSION low_priority_updates = OFF;
|
||||
--echo ** Connection default**
|
||||
connection default;
|
||||
|
@@ -1654,18 +1654,6 @@ EOF
|
||||
--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in 2>&1
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.in;
|
||||
|
||||
# 7. Test that stmt after send without reap IS allowed
|
||||
# if we have switched connections
|
||||
|
||||
connect (test_con1,localhost,root,,);
|
||||
--send select * from t1;
|
||||
connection default;
|
||||
select 1;
|
||||
connection test_con1;
|
||||
select 2;
|
||||
disconnect test_con1;
|
||||
connection default;
|
||||
|
||||
drop table t1;
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
|
@@ -187,6 +187,7 @@ SELECT * FROM t1;
|
||||
|
||||
--echo # Switch to connection con2
|
||||
connection con2;
|
||||
reap;
|
||||
SELECT * FROM t1;
|
||||
|
||||
connection default;
|
||||
|
Reference in New Issue
Block a user