diff options
| author | sasha@mysql.sashanet.com <> | 2000-10-28 23:26:48 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-10-28 23:26:48 -0600 |
| commit | 96815f82a670f107a2e34595c4b8a9330e00e3ea (patch) | |
| tree | d6984a4bdab21e43bace50514dc6578eafcae414 /libmysql | |
| parent | efeec3f2059f9c8deb8a17a1aca1dd6cc5f582e6 (diff) | |
| download | mariadb-git-96815f82a670f107a2e34595c4b8a9330e00e3ea.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
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index fecdd073a47..c7820916c97 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1333,6 +1333,7 @@ mysql_real_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; net->last_errno=CR_OUT_OF_MEMORY; strmov(net->last_error,ER(net->last_errno)); goto error; |