Commit d3985375 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)
Browse files

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

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
parents 9fa2f3c6 f3436e51

libmysql/libmysql.c

+1 −2
Original line number Diff line number Diff line
@@ -4680,6 +4680,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)

  {
@@ -4687,8 +4688,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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -145,4 +145,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)