1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'

Browse Source 
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:
Bjorn Munch 2010-01-07 11:22:45 +01:00
parent 570ee4c5e8
commit 9ab9c73a87
6 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysqltest.cc
View File

@ -4622,7 +4622,6 @@ void select_connection_name(const char *name)
if (!con) if (!con)
die("connection '%s' not found in connection pool", name); die("connection '%s' not found in connection pool", name);
con->pending= FALSE;
set_current_connection(con); set_current_connection(con);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@ -6517,9 +6516,6 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
if (flags & QUERY_SEND_FLAG) if (flags & QUERY_SEND_FLAG)
{ {
if (cn->pending)
die ("Cannot run query on connection between send and reap");
/* /*
Send the query Send the query
*/ */
@ -7111,6 +7107,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
init_dynamic_string(&ds_warnings, NULL, 0, 256); init_dynamic_string(&ds_warnings, NULL, 0, 256);
if (cn->pending && (flags & QUERY_SEND_FLAG))
die ("Cannot run query on connection between send and reap");
/* /*
Evaluate query if this is an eval command Evaluate query if this is an eval command
*/ */

7
mysql-test/r/mysqltest.result
View File

@ -542,13 +542,6 @@ f1
Abcd Abcd
mysqltest: At line 2: Cannot run query on connection between send and reap mysqltest: At line 2: Cannot run query on connection between send and reap
select * from t1;; select * from t1;;
select * from t1;;
select 1;
1
1
select 2;
2
2
drop table t1; 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 'remove_file'
mysqltest: At line 1: Missing required argument 'filename' to command 'write_file' mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'

1
mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
View File

@ -78,6 +78,7 @@ COMMIT;
--echo 'CONNECTION con2' --echo 'CONNECTION con2'
CONNECTION con2; CONNECTION con2;
reap;
UNLOCK tables; UNLOCK tables;
DROP TABLE t1; DROP TABLE t1;

1
mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
View File

@ -127,6 +127,7 @@ connection con0;
SET SESSION low_priority_updates = OFF; SET SESSION low_priority_updates = OFF;
--echo ** Connection con1 ** --echo ** Connection con1 **
connection con1; connection con1;
reap;
SET SESSION low_priority_updates = OFF; SET SESSION low_priority_updates = OFF;
--echo ** Connection default** --echo ** Connection default**
connection default; connection default;

12
mysql-test/t/mysqltest.test
View File

@ -1654,18 +1654,6 @@ EOF
--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in 2>&1 --exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in 2>&1
remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.in; 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; drop table t1;
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

1
mysql-test/t/partition_innodb_semi_consistent.test
View File

@ -187,6 +187,7 @@ SELECT * FROM t1;
--echo # Switch to connection con2 --echo # Switch to connection con2
connection con2; connection con2;
reap;
SELECT * FROM t1; SELECT * FROM t1;
connection default; connection default;