diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 15:43:10 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 15:43:10 +0500 |
| commit | 0eb21ee474dbca7c638f1142e3317c34ca86611f (patch) | |
| tree | bed368050d5c0541befd9108b4934b80970b0cac /libmysql | |
| parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
| parent | cc19246f5804c8ca4a71cb66ed233422337c031c (diff) | |
| download | mariadb-git-0eb21ee474dbca7c638f1142e3317c34ca86611f.tar.gz | |
Merge mysql.com:/home/hf/work/w3475/my50-w3475
into mysql.com:/home/hf/work/w3475/my51-w3475
client/mysqltest.c:
Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/include/deadlock.inc:
SCCS merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e80b142e419..0d30d275237 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4763,14 +4763,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) { /* |