database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
This commit is contained in:
df@pippilotta.erinye.com
2007-09-04 10:54:32 +02:00
parent 948cbc736c 59b504a5e3
commit ab791bc13d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libmysql/libmysql.c
View File

@ -4677,15 +4677,16 @@ 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");
DBUG_ENTER("cli_read_binary_rows");
if (!mysql) if (!mysql)
{ {
set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
return 1; DBUG_RETURN(1);
} }
DBUG_ENTER("cli_read_binary_rows");
net = &mysql->net; net = &mysql->net;
mysql= mysql->last_used_con; mysql= mysql->last_used_con;

2
scripts/mysql_config.sh
View File

@ -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"`

2
sql/CMakeLists.txt
View File

@ -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)