From 19a3899e2e03c4de83c5d6fd2aab1c28b21d2798 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Oct 2000 23:26:48 -0600 Subject: 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 --- sql/mini_client.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/mini_client.cc') 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; -- cgit v1.2.1