Commit df56b842 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into mysql.com:/home/jimw/my/mysql-5.0-clean
parents 74a96495 d4e14b2f

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -2321,6 +2321,9 @@ static struct my_option my_long_options[] = 
  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};





#include <help_start.h>



static void print_version(void)

{

  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,MTEST_VERSION,
@@ -2339,6 +2342,8 @@ void usage() 
  my_print_variables(my_long_options);

}



#include <help_end.h>





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/my_print_defaults.c

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ static struct my_option my_long_options[] = 
  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};





#include <help_start.h>



static void usage(my_bool version)

{

  printf("%s  Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE,
@@ -69,6 +72,8 @@ static void usage(my_bool version) 
  printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname);

}



#include <help_end.h>





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/perror.c

+5 −0
Original line number Diff line number Diff line
@@ -113,12 +113,15 @@ static HA_ERRORS ha_errlist[]= 
};





#include <help_start.h>



static void print_version(void)

{

  printf("%s Ver %s, for %s (%s)\n",my_progname,PERROR_VERSION,

	 SYSTEM_TYPE,MACHINE_TYPE);

}





static void usage(void)

{

  print_version();
@@ -130,6 +133,8 @@ static void usage(void) 
  my_print_variables(my_long_options);

}



#include <help_end.h>





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/resolve_stack_dump.c

+5 −0
Original line number Diff line number Diff line
@@ -65,12 +65,16 @@ static struct my_option my_long_options[] = 


static void verify_sort();





#include <help_start.h>



static void print_version(void)

{

  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,DUMP_VERSION,

	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);

}





static void usage()

{

  print_version();
@@ -87,6 +91,7 @@ The numeric-dump-file should contain a numeric stack trace from mysqld.\n\ 
If the numeric-dump-file is not given, the stack trace is read from stdin.\n");

}



#include <help_end.h>





static void die(const char* fmt, ...)

include/config-netware.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ extern "C" { 
#undef HAVE_SCHED_H

#undef HAVE_SYS_MMAN_H

#undef HAVE_SYNCH_H

#undef HAVE_MMAP

#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1

#define HAVE_PTHREAD_SIGMASK 1

#define HAVE_PTHREAD_YIELD_ZERO_ARG 1