summaryrefslogtreecommitdiff
path: root/sql/mini_client.cc
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-10-28 23:26:48 -0600
committerunknown <sasha@mysql.sashanet.com>2000-10-28 23:26:48 -0600
commit19a3899e2e03c4de83c5d6fd2aab1c28b21d2798 (patch)
treed6984a4bdab21e43bace50514dc6578eafcae414 /sql/mini_client.cc
parent8178d563dc9ef7befaae3f2ec6231990d213def1 (diff)
downloadmariadb-git-19a3899e2e03c4de83c5d6fd2aab1c28b21d2798.tar.gz
libmysql/libmysql.c
keep vio from being freed twice when we are low on memory mysys/safemalloc.c changes for --safemalloc-mem-limit sql/mini_client.cc keep vio from being freed twice sql/mysqld.cc changes for --safemalloc-mem-limit sql/slave.cc prevent closing connection twice sql/sql_string.h shrink() did not work right when my_realloc() failed BitKeeper/etc/ignore: Added .gdb_history to the ignore list libmysql/libmysql.c: keep vio from being freed twice when we are low on memory mysys/safemalloc.c: changes for --safemalloc-mem-limit sql/mini_client.cc: keep vio from being freed twice sql/mysqld.cc: changes for --safemalloc-mem-limit sql/slave.cc: prevent closing connection twice sql/sql_string.h: shrink() did not work right when my_realloc() failed
Diffstat (limited to 'sql/mini_client.cc')
-rw-r--r--sql/mini_client.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc
index 6ba2de57d2d..34f5c0a6ccd 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -611,6 +611,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
if (!net->vio || my_net_init(net, net->vio))
{
vio_delete(net->vio);
+ net->vio = 0; // safety
net->last_errno=CR_OUT_OF_MEMORY;
strmov(net->last_error,ER(net->last_errno));
goto error;