Commit 6b2ad60f authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com
Browse files

Merge paul@work.mysql.com:/home/bk/mysql-4.0 

into teton.kitebird.com:/home/paul/mysql-4.0
parents 6dc16728 6bebd251

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 4.0.3-beta)

AM_INIT_AUTOMAKE(mysql, 4.0.4-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_ISNAN

#define HAVE_FINITE

#define HAVE_ISAM		/* We want to have support for ISAM in 4.0 */

#define SPRINTF_RETURNS_INT



#ifdef NOT_USED

#define HAVE_SNPRINTF		/* Gave link error */

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ typedef union { 
#ifdef SPRINTF_RETURNS_PTR

#define my_sprintf(buff,args) ((int)(sprintf args - buff))

#else

#define my_sprintf(buff,args) sprintf args,strlen(buff)

#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff))

#endif

#endif

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3339,7 +3339,7 @@ struct my_option my_long_options[] = 
#ifdef USE_SYMDIR

  {"use-symbolic-links", 's', "Enable symbolic link support",

   (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,

   USE_PURIFY(0,1), 0, 0, 0, 0, 0},

   IF_PURIFY(0,1), 0, 0, 0, 0, 0},

#endif

  {"user", 'u', "Run mysqld daemon as user", (gptr*) &mysqld_user,

   (gptr*) &mysqld_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

sql/set_var.cc

+4 −3
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ struct show_var_st init_vars[]= { 
  {"log",                     (char*) &opt_log,                     SHOW_BOOL},

  {"log_update",              (char*) &opt_update_log,              SHOW_BOOL},

  {"log_bin",                 (char*) &opt_bin_log,                 SHOW_BOOL},

  {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_BOOL},

  {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_MY_BOOL},

  {"log_slow_queries",        (char*) &opt_slow_log,                SHOW_BOOL},

  {sys_log_warnings.name,     (char*) &sys_log_warnings,	    SHOW_SYS},

  {sys_long_query_time.name,  (char*) &sys_long_query_time, 	    SHOW_SYS},
@@ -481,7 +481,7 @@ struct show_var_st init_vars[]= { 
  {"myisam_recover_options",  (char*) &myisam_recover_options_str,  SHOW_CHAR_PTR},

  {sys_myisam_sort_buffer_size.name, (char*) &sys_myisam_sort_buffer_size, SHOW_SYS},

#ifdef __NT__

  {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_BOOL},

  {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_MY_BOOL},

#endif

  {sys_net_buffer_length.name,(char*) &sys_net_buffer_length,       SHOW_SYS},

  {sys_net_read_timeout.name, (char*) &sys_net_read_timeout,        SHOW_SYS},
@@ -1208,7 +1208,8 @@ void set_var_free() 


sys_var *find_sys_var(const char *str, uint length)

{

  sys_var *var= (sys_var*) hash_search(&system_variable_hash, str,

  sys_var *var= (sys_var*) hash_search(&system_variable_hash,

				       (byte*) str,

				       length ? length :

				       strlen(str));

  if (!var)