1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql
This commit is contained in:
unknown 2000-10-28 14:38:28 -06:00
commit b0f645e465
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/mf_format.c
View File

@ -33,11 +33,15 @@
/* 32 Resolve filename to full path */ /* 32 Resolve filename to full path */
/* 64 Return NULL if too long path */ /* 64 Return NULL if too long path */
#ifdef SCO
#define BUFF_LEN 4097
#else
#ifdef MAXPATHLEN #ifdef MAXPATHLEN
#define BUFF_LEN MAXPATHLEN #define BUFF_LEN MAXPATHLEN
#else #else
#define BUFF_LEN FN_LEN #define BUFF_LEN FN_LEN
#endif #endif
#endif
my_string fn_format(my_string to, const char *name, const char *dsk, my_string fn_format(my_string to, const char *name, const char *dsk,
const char *form, int flag) const char *form, int flag)

3
sql/slave.cc
View File

@ -644,13 +644,14 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
// unless set explictly // unless set explictly
close_thread_tables(thd); close_thread_tables(thd);
free_root(&thd->mem_root,0); free_root(&thd->mem_root,0);
delete ev;
if (thd->query_error) if (thd->query_error)
{ {
sql_print_error("Slave: error running query '%s' ", sql_print_error("Slave: error running query '%s' ",
qev->query); qev->query);
return 1; return 1;
} }
delete ev;
if(thd->fatal_error) if(thd->fatal_error)
{ {