Commit 631f395f authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents d427ecb4 e720b5a6

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

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

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -3287,7 +3287,7 @@ option_value: 
	    LEX *lex=Lex;

	    lex->var_list.push_back(new set_var(lex->option_type,

						find_sys_var("tx_isolation"),

						new Item_int((int) $4)));

						new Item_int((int32) $4)));

	  }

	| CHAR_SYM SET opt_equal set_expr_or_default

	{