From 96815f82a670f107a2e34595c4b8a9330e00e3ea Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
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

---
 sql/sql_string.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_string.h')

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
-- 
cgit v1.2.1