Commit 974d3b47 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 0bb025f7 ac2c02f6

client/mysqltest.c

+1 −12
Original line number Diff line number Diff line
@@ -2143,19 +2143,8 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, 
    *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

mysql-test/r/mysqltest.result

+1 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/mysqltest.test

+7 −1
Original line number Diff line number Diff line
@@ -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