From 9e1257059d0dc1131313964e171c43c05a65ca99 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Sat, 28 Oct 2000 14:38:09 -0600
Subject: [PATCH] mysys/mf_format.c     workaround for SCO realpath() bug
 sql/slave.cc     fixed memory leak when slave runs bad query

mysys/mf_format.c:
  workaround for SCO realpath() bug
sql/slave.cc:
  fixed memory leak when slave runs bad query
---
 mysys/mf_format.c | 4 ++++
 sql/slave.cc      | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index 63e1b3cb1ba..47d5e17cf22 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -33,11 +33,15 @@
 	/*		32  Resolve filename to full path */
 	/*		64  Return NULL if too long path */
 
+#ifdef SCO
+#define BUFF_LEN 4097
+#else
 #ifdef MAXPATHLEN
 #define BUFF_LEN MAXPATHLEN
 #else
 #define BUFF_LEN FN_LEN
 #endif
+#endif
 
 my_string fn_format(my_string to, const char *name, const char *dsk,
 		    const char *form, int flag)
diff --git a/sql/slave.cc b/sql/slave.cc
index 676c80bb04a..6873933dfd3 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -644,13 +644,14 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
       // unless set explictly
       close_thread_tables(thd);
       free_root(&thd->mem_root,0);
+      delete ev;
+      
       if (thd->query_error)
       {
 	sql_print_error("Slave:  error running query '%s' ",
 			qev->query);
 	return 1;
       }
-      delete ev;
 	    
       if(thd->fatal_error)
       {