mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Portability fixes

Browse source
This commit is contained in:
monty@hundin.mysql.fi 2001-08-30 21:16:39 +03:00
parent f908efb0a8
commit 91db5836e0
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Docs/manual.texi
View file

@ -46712,6 +46712,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.42 @appendixsubsec Changes in release 3.23.42
@itemize @bullet @itemize @bullet
@item @item
Fixed problem with @code{myisampack} and @code{BLOB}.
@item
Fixes problem when one edited @code{.MRG} tables by hand. Fixes problem when one edited @code{.MRG} tables by hand.
(Patch from Benjamin Pflugmann). (Patch from Benjamin Pflugmann).
@item @item

5
client/mysqlbinlog.cc
View file

@ -21,9 +21,8 @@
#include <m_string.h> #include <m_string.h>
#include <my_sys.h> #include <my_sys.h>
#include <getopt.h> #include <getopt.h>
#include <my_pthread.h>
#include <thr_alarm.h>
#include <mysql.h> #include <mysql.h>
#include <time.h>
#include "log_event.h" #include "log_event.h"
#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) #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() 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);
} }

3
myisam/ft_test1.c
View file

@ -30,7 +30,6 @@ static int create_flag=0,error=0;
#define MAX_REC_LENGTH 300 #define MAX_REC_LENGTH 300
static char record[MAX_REC_LENGTH],read_record[MAX_REC_LENGTH]; 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 int run_test(const char *filename);
static void get_options(int argc, char *argv[]); static void get_options(int argc, char *argv[]);
static void create_record(char *, int); static void create_record(char *, int);
@ -235,7 +234,7 @@ void create_record(char *pos, int n)
/* Read options */ /* Read options */
void get_options(int argc,char *argv[]) static void get_options(int argc,char *argv[])
{ {
int c; int c;
const char *options="hVvsNSKFU#:"; const char *options="hVvsNSKFU#:";

4
sql/log_event.cc
View file

@ -277,7 +277,11 @@ void Log_event::print_timestamp(FILE* file, time_t* ts)
{ {
ts = &when; ts = &when;
} }
#ifdef MYSQL_SERVER
localtime_r(ts,&tm_tmp); localtime_r(ts,&tm_tmp);
#else
localtime(ts);
#endif
fprintf(file,"%02d%02d%02d %2d:%02d:%02d", fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
tm_tmp.tm_year % 100, tm_tmp.tm_year % 100,