diff options
| author | sasha@mysql.sashanet.com <> | 2000-10-28 14:38:09 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-10-28 14:38:09 -0600 |
| commit | 3bd51a5205c0d15f2e8e3add2f1aa9c3cdcf5d70 (patch) | |
| tree | 92fdebdcd675b71ba65bfa88cbfbc8c7fb86d926 | |
| parent | 75cd25a5794f43ae75cde851fb01ee4c3644c195 (diff) | |
| download | mariadb-git-3bd51a5205c0d15f2e8e3add2f1aa9c3cdcf5d70.tar.gz | |
mysys/mf_format.c
workaround for SCO realpath() bug
sql/slave.cc
fixed memory leak when slave runs bad query
| -rw-r--r-- | mysys/mf_format.c | 4 | ||||
| -rw-r--r-- | sql/slave.cc | 3 |
2 files changed, 6 insertions, 1 deletions
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) { |