Commit 4e82ea29 authored by jani@hynda.(none)'s avatar jani@hynda.(none)
Browse files

Merge work:/home/bk/mysql-4.0/ into hynda.(none):/home/my/bk/mysql-4.0

parents fadc09b2 a5ec0a90

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <mysql_embed.h>

#include <mysql.h>

#include <errmsg.h>

#include <getopt.h>

#include <my_getopt.h>



/* We have to define 'enum options' identical in all files to keep OS2 happy */

client/mysql.cc

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "client_priv.h"

#include <m_ctype.h>

#include <stdarg.h>

#include <my_getopt.h>

#include <my_dir.h>

#ifndef __GNU_LIBRARY__

#define __GNU_LIBRARY__		      // Skip warnings in getopt.h
@@ -41,7 +40,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER= "12.5";

const char *VER= "12.6";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024

client/mysqladmin.c

+1 −2
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ 


#include "client_priv.h"

#include <signal.h>

#include <my_getopt.h>

#ifdef THREAD

#include <my_pthread.h>				/* because of signal()	*/

#endif



#define ADMIN_VERSION "8.32"

#define ADMIN_VERSION "8.34"

#define MAX_MYSQL_VAR 64

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3

client/mysqlbinlog.cc

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "client_priv.h"

#include <time.h>

#include "log_event.h"

#include <my_getopt.h>



#define PROBE_HEADER_LEN (4+EVENT_LEN_OFFSET+4)
@@ -125,7 +124,7 @@ static void die(const char* fmt, ...) 


static void print_version()

{

  printf("%s Ver 2.1 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

  printf("%s Ver 2.2 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

}

client/mysqlcheck.c

+1 −2
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


/* By Jani Tolonen, 2001-04-20, MySQL Development Team */



#define CHECK_VERSION "2.2"

#define CHECK_VERSION "2.3"



#include "client_priv.h"

#include <my_getopt.h>

#include <m_ctype.h>

#include "mysql_version.h"

#include "mysqld_error.h"