Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

libmysql/libmysql.c

@@ -4679,10 +4679,12 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
   NET        *net;
   DBUG_ENTER("cli_read_binary_rows");
 
+  DBUG_ENTER("cli_read_binary_rows");
+  
   if (!mysql)
   {
     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
-    return 1;
+    DBUG_RETURN(1);
   }
 
   net = &mysql->net;