Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

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)

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)
       {