Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged

1 files changed, 1 insertions, 2 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index c8e2d48873f..5f80e8b546b 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4677,6 +4677,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
   MYSQL_DATA *result= &stmt->result;
   MYSQL_ROWS *cur, **prev_ptr= &result->data;
   NET        *net;
+  DBUG_ENTER("cli_read_binary_rows");
 
   if (!mysql)
   {
@@ -4684,8 +4685,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
     return 1;
   }
 
-  DBUG_ENTER("cli_read_binary_rows");
-
   net = &mysql->net;
   mysql= mysql->last_used_con;