diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-30 00:06:29 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-30 00:06:29 +0200 |
| commit | 3e22e3cac80b9d0e2a8cb79161b00b011cb190c5 (patch) | |
| tree | e5c2638c5b8d55229af3b21edb9da6dd34f8190c | |
| parent | f5536380a31b879851d65617694a3797e3431f90 (diff) | |
| parent | 47874b60912833b5d0179aac6c22175966f8767d (diff) | |
| download | mariadb-git-3e22e3cac80b9d0e2a8cb79161b00b011cb190c5.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
| -rw-r--r-- | libmysql/libmysql.c | 3 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 | ||||
| -rwxr-xr-x | sql/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c8e2d48873f..5f80e8b546b 100644 --- a/libmysql/libmysql.c +++ b/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; diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index f094cb060b7..6b054e83720 100644 --- a/scripts/mysql_config.sh +++ b/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"` diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index a0c00e868e5..299f4ae4285 100755 --- a/sql/CMakeLists.txt +++ b/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) |