bk commit into 5.0 tree (msvensson:1.2021)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2021 06/01/17 19:02:42 msvensson@neptunus.(none) +3 -0
  Fix for connection not being added to connection pool if "disable_abort_on_error" was used.

  mysql-test/t/mysqltest.test
    1.29 06/01/17 19:02:38 msvensson@neptunus.(none) +7 -1
    Add test for connection not being added to connection pool if "disable_abort_on_error" was used

  mysql-test/r/mysqltest.result
    1.25 06/01/17 19:02:38 msvensson@neptunus.(none) +1 -0
    Update test result

  client/mysqltest.c
    1.197 06/01/17 19:02:37 msvensson@neptunus.(none) +1 -12
    If connection suceeded don't close it, just call handle_no_error which will check if an error was expected

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.24/mysql-test/r/mysqltest.result	2006-01-11 11:06:20 +01:00
+++ 1.25/mysql-test/r/mysqltest.result	2006-01-17 19:02:38 +01:00
@@ -362,6 +362,7 @@
 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

--- 1.28/mysql-test/t/mysqltest.test	2006-01-12 18:19:51 +01:00
+++ 1.29/mysql-test/t/mysqltest.test	2006-01-17 19:02:38 +01:00
@@ -910,7 +910,13 @@
 --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

--- 1.196/client/mysqltest.c	2006-01-11 11:10:53 +01:00
+++ 1.197/client/mysqltest.c	2006-01-17 19:02:37 +01:00
@@ -2143,19 +2143,8 @@
     *create_conn= 0;
     goto err;
   }
-  else
-  {
-    handle_no_error(q);
 
-    /*
-      Fail if there was no error but we expected it.
-      We also don't want to have connection in this case.
-    */
-    mysql_close(con);
-    *create_conn= 0;
-    error= 1;
-    goto err;
-  }
+  handle_no_error(q);
 
   /*
    TODO: change this to 0 in future versions, but the 'kill' test relies on