diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-23 16:50:01 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-23 16:50:01 +0500 |
| commit | 778d32b92d15c28e58b12fc9128c85c94766b69b (patch) | |
| tree | 0107bee9648f6738988eae97c771bfb155cc0cc4 /libmysql | |
| parent | a5a18a775030ad4e90947949a473fa84a698755f (diff) | |
| parent | 0b861d92230e5718ddb82a2bd3be074e541bf552 (diff) | |
| download | mariadb-git-778d32b92d15c28e58b12fc9128c85c94766b69b.tar.gz | |
Merge mysql.com:/home/hf/work/w3475/my41-w3475
into mysql.com:/home/hf/work/w3475/my50-w3475
mysql-test/t/flush.test:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
client/mysqltest.c:
merging
libmysql/libmysql.c:
merging
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 21fb84fb19a..8786655d9c3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4769,14 +4769,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) { /* |