Commit ad1f3bb1 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
parents 337f02b7 3b55c6f3

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ ram@gw.mysql.r18.ru 
ram@mysql.r18.ru

ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

root@x3.internalnet

salle@geopard.(none)

salle@geopard.online.bg

VC++Files/sql/mysqld.dsp

+83 −0
Original line number Diff line number Diff line
@@ -900,6 +900,89 @@ SOURCE=.\log_event.cpp 
# End Source File

# Begin Source File



SOURCE=.\message.mc



!IF  "$(CFG)" == "mysqld - Win32 Release"



!ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"



!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"



# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ELSEIF  "$(CFG)" == "mysqld - Win32 Max"



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"



!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ENDIF 



# End Source File

# Begin Source File



SOURCE=.\message.rc

# End Source File

# Begin Source File



SOURCE=.\mf_iocache.cpp



!IF  "$(CFG)" == "mysqld - Win32 Release"

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int get_options(int argc, char **argv) 
  opt_max_allowed_packet= *mysql_params->p_max_allowed_packet;

  opt_net_buffer_length= *mysql_params->p_net_buffer_length;



  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))

    exit(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;

client/mysqladmin.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int main(int argc,char *argv[]) 
  mysql_init(&mysql);

  load_defaults("my",load_default_groups,&argc,&argv);

  save_argv = argv;				/* Save for free_defaults */

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))

  {

    free_defaults(save_argv);

    exit(ho_error);

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int parse_args(int *argc, char*** argv) 


  result_file = stdout;

  load_defaults("my",load_default_groups,argc,argv);

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL)))

    exit(ho_error);



  return 0;