Commit f811aa44 authored by tim@white.box's avatar tim@white.box
Browse files

Merge

parents afd8a6db c8e07826

client/mysqlbinlog.cc

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <m_string.h>

#include <my_sys.h>

#include <getopt.h>

#include <my_pthread.h>

#include <thr_alarm.h>

#include <mysql.h>

#include "log_event.h"

client/mysqltest.c

+4 −4
Original line number Diff line number Diff line
@@ -251,10 +251,10 @@ static int eval_result = 0; 


/* Disable functions that only exist in MySQL 4.0 */

#if MYSQL_VERSION_ID < 40000

static void mysql_enable_rpl_parse(MYSQL* mysql) {}

static void mysql_disable_rpl_parse(MYSQL* mysql) {}

static int mysql_rpl_parse_enabled(MYSQL* mysql) { return 1; }

static int mysql_rpl_probe(MYSQL *mysql) { return 1; }

static void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {}

static void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {}

static int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; }

static int mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; }

#endif

client/thread_test.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#ifndef THREAD



int main(int argc, char **argv)

int main(void)

{

  printf("This test must be compiled with multithread support to work\n");

  exit(1);

include/my_pthread.h

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#ifndef _my_pthread_h

#define _my_pthread_h



#ifdef __cplusplus

extern "C" {

#endif



#include <errno.h>

#ifndef ETIME

#define ETIME ETIMEDOUT				/* For FreeBSD */
@@ -612,4 +616,9 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); 
#endif /* SAFE_STATISTICS */

#endif /* HAVE_ATOMIC_ADD */

#endif /* thread_safe_increment */



#ifdef __cplusplus

}

#endif



#endif /* _my_ptread_h */

myisam/myisamchk.c

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static uint decode_bits; 
static char **default_argv;

static const char *load_default_groups[]= { "myisamchk", 0 };

static const char *set_charset_name;

static uint8 set_charset_number;

static CHARSET_INFO *set_charset;



static const char *type_names[]=
@@ -607,9 +606,9 @@ static int myisamchk(MI_CHECK *param, my_string filename) 
	(((ulonglong) 1L << share->base.keys)-1)) ||

       test_if_almost_full(info) ||

       info->s->state.header.file_version[3] != myisam_file_magic[3] ||

       (set_charset && set_charset_number != share->state.header.language)))

       (set_charset && set_charset->number != share->state.header.language)))

  {

    check_param.language=set_charset_number;

    check_param.language=set_charset->number;

    if (recreate_table(&check_param, &info,filename))

    {

      VOID(fprintf(stderr,