diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-30 21:16:39 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-30 21:16:39 +0300 |
| commit | 83c86c854a1b40bfe46e0464de63e97a75a9b030 (patch) | |
| tree | 88a2d8e493b1c0e0635e8f895e869182dd265d61 | |
| parent | 634378a5ac6a8a9acc4f1d10fe31ca2f92b84b0c (diff) | |
| download | mariadb-git-83c86c854a1b40bfe46e0464de63e97a75a9b030.tar.gz | |
Portability fixes
Docs/manual.texi:
Changelog
client/mysqlbinlog.cc:
Portability fix
myisam/ft_test1.c:
Portability fix
sql/log_event.cc:
Portability fix
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 5 | ||||
| -rw-r--r-- | myisam/ft_test1.c | 3 | ||||
| -rw-r--r-- | sql/log_event.cc | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index f23ef6cca94..cd3aaa48e2d 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46712,6 +46712,8 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.42 @itemize @bullet @item +Fixed problem with @code{myisampack} and @code{BLOB}. +@item Fixes problem when one edited @code{.MRG} tables by hand. (Patch from Benjamin Pflugmann). @item diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index db28184f3e7..289f5aa517f 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -21,9 +21,8 @@ #include <m_string.h> #include <my_sys.h> #include <getopt.h> -#include <my_pthread.h> -#include <thr_alarm.h> #include <mysql.h> +#include <time.h> #include "log_event.h" #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) @@ -113,7 +112,7 @@ static void die(const char* fmt, ...) static void print_version() { - printf("%s Ver 1.5 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); + printf("%s Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); } diff --git a/myisam/ft_test1.c b/myisam/ft_test1.c index e986f686302..5093b591fb2 100644 --- a/myisam/ft_test1.c +++ b/myisam/ft_test1.c @@ -30,7 +30,6 @@ static int create_flag=0,error=0; #define MAX_REC_LENGTH 300 static char record[MAX_REC_LENGTH],read_record[MAX_REC_LENGTH]; -void get_options(int argc,char *argv[]); static int run_test(const char *filename); static void get_options(int argc, char *argv[]); static void create_record(char *, int); @@ -235,7 +234,7 @@ void create_record(char *pos, int n) /* Read options */ -void get_options(int argc,char *argv[]) +static void get_options(int argc,char *argv[]) { int c; const char *options="hVvsNSKFU#:"; diff --git a/sql/log_event.cc b/sql/log_event.cc index 41efa0f5658..6e99e031f4a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -277,7 +277,11 @@ void Log_event::print_timestamp(FILE* file, time_t* ts) { ts = &when; } +#ifdef MYSQL_SERVER localtime_r(ts,&tm_tmp); +#else + localtime(ts); +#endif fprintf(file,"%02d%02d%02d %2d:%02d:%02d", tm_tmp.tm_year % 100, |