diff options
| author | unknown <kostja@bodhi.local> | 2006-11-29 23:36:26 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-29 23:36:26 +0300 |
| commit | afc91556fb5b57492008a043c2edd96b39dfd9f6 (patch) | |
| tree | c8d9d8759362a89e2fc5a7bf0b6f2f7369ef34c7 /libmysql | |
| parent | 0e978328ae3055a55f9e21cc7b395cf2581925b9 (diff) | |
| parent | 8f71610f9cd13fafdfd764da5554532b2624e215 (diff) | |
| download | mariadb-git-afc91556fb5b57492008a043c2edd96b39dfd9f6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c2d98a81042..dc6d658fcdf 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -89,8 +89,8 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) if HAVE_YASSL -yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ - $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \ + $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la endif # The automatic dependencies miss this diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e94d5111de0..898b583a58b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4766,14 +4766,6 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) DBUG_RETURN(1); } - if (result->data) - { - free_root(&result->alloc, MYF(MY_KEEP_PREALLOC)); - result->data= NULL; - result->rows= 0; - stmt->data_cursor= NULL; - } - if (stmt->update_max_length && !stmt->bind_result_done) { /* |