bk commit into 5.2 tree (iggy:1.2605)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.2 repository of iggy. When iggy 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-04 16:00:26-04:00, iggy@alf.(none) +2 -0
  Win Build Fix

  libmysql/libmysql.c@stripped, 2007-10-04 16:00:22-04:00, iggy@alf.(none) +1 -1
    Win Build Fix

  sql/CMakeLists.txt@stripped, 2007-10-04 16:00:22-04:00, iggy@alf.(none) +5 -3
    Win Build Fix

diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
--- a/libmysql/libmysql.c	2007-08-25 04:43:10 -04:00
+++ b/libmysql/libmysql.c	2007-10-04 16:00:22 -04:00
@@ -4677,6 +4677,7 @@ int cli_read_binary_rows(MYSQL_STMT *stm
   MYSQL_DATA *result= &stmt->result;
   MYSQL_ROWS *cur, **prev_ptr= &result->data;
   NET        *net;
+  DBUG_ENTER("cli_read_binary_rows");
 
   if (!mysql)
   {
@@ -4684,7 +4685,6 @@ int cli_read_binary_rows(MYSQL_STMT *stm
     return 1;
   }
 
-  DBUG_ENTER("cli_read_binary_rows");
 
   net = &mysql->net;
   mysql= mysql->last_used_con;
diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-10-03 12:56:56 -04:00
+++ b/sql/CMakeLists.txt	2007-10-04 16:00:22 -04:00
@@ -96,9 +96,11 @@ SET_TARGET_PROPERTIES(mysqld PROPERTIES 
 # Work around for 2.4.6 bug, OUTPUT_NAME will not set the right .PDB
 # file name. Note that COMPILE_FLAGS set some temporary pdb during build,
 # LINK_FLAGS sets the real one.
-SET_TARGET_PROPERTIES(mysqld PROPERTIES
-                      COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb"
-                      LINK_FLAGS  "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
+IF(MYSQLD_EXE_SUFFIX)
+   SET_TARGET_PROPERTIES(mysqld PROPERTIES
+                         COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb"
+                         LINK_FLAGS  "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
+ENDIF(MYSQLD_EXE_SUFFIX)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")