summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@hfmain.(none)>2007-07-19 20:58:04 +0500
committerunknown <holyfoot/hf@hfmain.(none)>2007-07-19 20:58:04 +0500
commit244c7ef3153c1831313269f306825368fd5e64e8 (patch)
treec881446c728e19d4121e210e12e497f0fd0c5107 /libmysql
parent1d0749b858b2450e44f182dcf58dd50b44a938cf (diff)
parent9917ce268d41942e977e0cfe0f093c20bb4018a2 (diff)
downloadmariadb-git-244c7ef3153c1831313269f306825368fd5e64e8.tar.gz
Merge mysql.com:/home/hf/work/29687/my50-29687
into mysql.com:/home/hf/work/29687/my51-29687 libmysql/libmysql.c: Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index a05d061204b..46d0c8f1037 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4939,7 +4939,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
Reset stored result set if so was requested or it's a part
of cursor fetch.
*/
- if (result->data && (flags & RESET_STORE_RESULT))
+ if (flags & RESET_STORE_RESULT)
{
/* Result buffered */
free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));