summaryrefslogtreecommitdiff
path: root/sql-common/client.c
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2016-08-16 21:23:57 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2016-08-16 21:23:57 +0200
commit05f61ba46046ca835071a73b9255e787dcce9255 (patch)
treeeee5377759fd35c8f432771ea0636315945e5b57 /sql-common/client.c
parentdf09d5e724af93fea096fd841fad9e93d2615ad5 (diff)
downloadmariadb-git-05f61ba46046ca835071a73b9255e787dcce9255.tar.gz
MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0
fix for async operations
Diffstat (limited to 'sql-common/client.c')
-rw-r--r--sql-common/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 184d7983a00..78c5426367c 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3644,7 +3644,8 @@ error:
/* Free alloced memory */
end_server(mysql);
mysql_close_free(mysql);
- if (!(client_flag & CLIENT_REMEMBER_OPTIONS))
+ if (!(client_flag & CLIENT_REMEMBER_OPTIONS) &&
+ !mysql->options.extension->async_context)
mysql_close_free_options(mysql);
}
DBUG_RETURN(0);