bk commit into 6.0 tree (hakank:1.2613)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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@stripped, 2007-10-02 21:29:23+02:00, hakank@lu0011.(none) +1 -0
  Fix for VS builds.

  libmysql/libmysql.c@stripped, 2007-10-02 21:29:19+02:00, hakank@lu0011.(none) +3 -3
    Fix for VS builds.

diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
--- a/libmysql/libmysql.c	2007-08-25 10:43:10 +02:00
+++ b/libmysql/libmysql.c	2007-10-02 21:29:19 +02:00
@@ -4678,13 +4678,13 @@ int cli_read_binary_rows(MYSQL_STMT *stm
   MYSQL_ROWS *cur, **prev_ptr= &result->data;
   NET        *net;
 
+  DBUG_ENTER("cli_read_binary_rows");
+
   if (!mysql)
   {
     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
-    return 1;
+    DBUG_RETURN(1);
   }
-
-  DBUG_ENTER("cli_read_binary_rows");
 
   net = &mysql->net;
   mysql= mysql->last_used_con;