Commit ecbff124 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)

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

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
parents 78341191 edf772ae
...@@ -4677,6 +4677,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) ...@@ -4677,6 +4677,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *result= &stmt->result; MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data; MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net; NET *net;
DBUG_ENTER("cli_read_binary_rows");
if (!mysql) if (!mysql)
{ {
...@@ -4684,8 +4685,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) ...@@ -4684,8 +4685,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
return 1; return 1;
} }
DBUG_ENTER("cli_read_binary_rows");
net = &mysql->net; net = &mysql->net;
mysql= mysql->last_used_con; mysql= mysql->last_used_con;
......
...@@ -121,7 +121,7 @@ done ...@@ -121,7 +121,7 @@ done
cflags=`echo "$cflags"|sed -e 's/ *\$//'` cflags=`echo "$cflags"|sed -e 's/ *\$//'`
# Same for --libs(_r) # Same for --libs(_r)
for remove in lmtmalloc static-libcxa i-static for remove in lmtmalloc static-libcxa i-static static-intel
do do
# We know the strings starts with a space # We know the strings starts with a space
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"` libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
......
...@@ -166,4 +166,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ...@@ -166,4 +166,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
ADD_DEPENDENCIES(udf_example strings) ADD_DEPENDENCIES(udf_example strings)
TARGET_LINK_LIBRARIES(udf_example wsock32) TARGET_LINK_LIBRARIES(udf_example strings wsock32)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment