bzr push into mysql-5.1-telco-7.1 branch (frazer:3141 to 3142)

[Frazer Clement]

 3142 Frazer Clement	2009-11-06 [merge]
      Merge 7.0->7.1
      modified:
        sql-common/client.c

 3141 Frazer Clement	2009-11-06 [merge]
      Merge 7.0->7.1
      modified:
        sql-common/client.c

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2009-11-06 01:15:42 +0000
+++ b/sql-common/client.c	2009-11-06 11:30:23 +0000
@@ -2053,7 +2053,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons
     char port_buf[NI_MAXSERV];
     my_socket sock= my_socket_create_invalid();
     int saved_error, status= -1, bind_result= 0;
- 
+    my_bool create_ok= 0, bind_ok= 0;
+
     unix_socket=0;				/* This is not used */
     if (!port)
       port=mysql_port;
@@ -2128,7 +2129,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons
       For each IP address, attempt to bind the socket to each client address 
       for the client-side bind hostname until the bind is successful.
     */
-    my_bool create_ok, bind_ok;
     for (t_res= res_lst; t_res; t_res= t_res->ai_next)    
     {
       DBUG_PRINT("info",("Creating socket : Family %d, Type %d, Protocol %d",