Commit 91db5836 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes

parent f908efb0

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -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

client/mysqlbinlog.cc

+2 −3
Original line number Diff line number Diff line
@@ -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);

}

myisam/ft_test1.c

+1 −2
Original line number Diff line number Diff line
@@ -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#:";

sql/log_event.cc

+4 −0
Original line number Diff line number Diff line
@@ -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,