Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

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

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;
 

scripts/mysql_config.sh

@@ -121,7 +121,7 @@ done
 cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
 
 # Same for --libs(_r)
-for remove in lmtmalloc static-libcxa i-static
+for remove in lmtmalloc static-libcxa i-static static-intel
 do
   # We know the strings starts with a space
   libs=`echo "$libs"|sed -e "s/ -$remove  */ /g"` 

sql/CMakeLists.txt

@@ -166,4 +166,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings)
-TARGET_LINK_LIBRARIES(udf_example wsock32)
+TARGET_LINK_LIBRARIES(udf_example strings wsock32)