database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

upmerge 49269 amendment

Browse Source
This commit is contained in:
Bjorn Munch
2010-01-06 12:59:41 +01:00
parent 7ab9cbe3c3 ed64190b23
commit b7c0557005
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/mysqltest.cc
View File

@ -4584,6 +4584,7 @@ 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;

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

@ -542,6 +542,13 @@ 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'

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

@ -1654,6 +1654,18 @@ 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;
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------