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 /sql/sql_string.h | |
| 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 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 45c82b82dd0..1c9e822cce5 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -125,7 +125,7 @@ public: char *new_ptr; if (!(new_ptr=(char*) my_realloc(Ptr,arg_length,MYF(0)))) { - (void) my_free(Ptr,MYF(0)); + Alloced_length = 0; real_alloc(arg_length); } else |