diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-17 19:02:42 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-17 19:02:42 +0100 |
| commit | ac2c02f6fa70ec7af9b48ba10eec672e8f4e59a6 (patch) | |
| tree | 9a1cb07d8af522e595e5c9fb8ab67c32134c5cc5 /mysql-test | |
| parent | fe1970d4b9084de6e883b0dae50ab4d5d3957e54 (diff) | |
| download | mariadb-git-ac2c02f6fa70ec7af9b48ba10eec672e8f4e59a6.tar.gz | |
Fix for connection not being added to connection pool if "disable_abort_on_error" was used.
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 067054510c2..df530eda285 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -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 diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 5cf49185c30..e6dc4d356c2 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -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 |