database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix for connection not being added to connection pool if "disable_abort_on_error" was used.

Browse Source 
client/mysqltest.c:
  If connection suceeded don't close it, just call handle_no_error which will check if an error was expected
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Add test for connection not being added to connection pool if "disable_abort_on_error" was used
This commit is contained in:
unknown
2006-01-17 19:02:42 +01:00
parent fe1970d4b9
commit ac2c02f6fa
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,6 +362,7 @@ OK
mysqltest: In included file "./var/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
mysqltest: In included file "./var/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool
mysqltest: In included file "./var/tmp/con.sql": At line 2: Connection test_con1 already exists
connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
Output from mysqltest-x.inc
Output from mysqltest-x.inc
Output from mysqltest-x.inc

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

@@ -910,7 +910,13 @@ select "a" as col1, "c" as col2;
--error 1
--exec echo "source var/tmp/con.sql;" | $MYSQL_TEST 2>&1
# connect when "disable_abort_on_error" caused "connection not found"
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
--disable_abort_on_error
connect (con1,localhost,root,,);
connection default;
connection con1;
--enable_abort_on_error
# ----------------------------------------------------------------------------
# Test mysqltest arguments