summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-01-17 19:02:42 +0100
committerunknown <msvensson@neptunus.(none)>2006-01-17 19:02:42 +0100
commit10e29de366943769f859187016a6224f11193e23 (patch)
tree9a1cb07d8af522e595e5c9fb8ab67c32134c5cc5 /mysql-test/r/mysqltest.result
parent84462f69d6b4509d5efcc6a2247be4c805f3a62d (diff)
downloadmariadb-git-10e29de366943769f859187016a6224f11193e23.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/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result1
1 files changed, 1 insertions, 0 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