diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
| commit | af27243cf7b6a37ed08a353488e00ab25861c485 (patch) | |
| tree | 8abd660ca8962e8c1a9aa58dbabd22e3c2e6f163 /sql/slave.cc | |
| parent | 1460afeac8f4839d1f7ee28c18af85e1e3513a40 (diff) | |
| download | mariadb-git-af27243cf7b6a37ed08a353488e00ab25861c485.tar.gz | |
Fix after merge
Updated WEEK() and DATE information in the manual.
Docs/manual.texi:
Updated WEEK() information.
Added more information of how MySQL stores dates.
libmysql/Makefile.am:
Fix after merge
libmysqld/lib_vio.c:
Use new vio_blocking()
mysql-test/r/group_by.result:
Update results after merge
sql/ha_innodb.cc:
Fix after merge
sql/lex.h:
Fix after merge
sql/slave.cc:
Added missing include file
sql/sql_base.cc:
Added function comments
vio/test-ssl.c:
Fix after merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 84e0f6dd236..2bde91f3ccd 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -23,6 +23,7 @@ #include "sql_repl.h" #include "repl_failsafe.h" #include <thr_alarm.h> +#include <my_dir.h> #include <assert.h> bool use_slave_mask = 0; @@ -1029,7 +1030,6 @@ void end_master_info(MASTER_INFO* mi) int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname) { - MY_STAT stat_area; char fname[FN_REFLEN+128]; int info_fd; const char* msg = 0; @@ -1069,7 +1069,7 @@ int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname) DBUG_RETURN(1); /* if file does not exist */ - if (!my_stat(fname, &stat_area, MYF(0))) + if (access(fname,F_OK)) { /* If someone removed the file from underneath our feet, just close |