Commit e8d41a5b authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_getopt.h:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
parents 42771f98 ad1f3bb1

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ jcole@mugatu.jcole.us 
jcole@mugatu.spaceapes.com

jcole@sarvik.tfr.cafe.ee

jcole@tetra.spaceapes.com

joerg@mysql.com

joreland@mysql.com

jorge@linux.jorge.mysql.com

jplindst@t41.(none)

VC++Files/sql/mysqld.dsp

+83 −0
Original line number Diff line number Diff line
@@ -920,6 +920,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
@@ -858,7 +858,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
@@ -276,7 +276,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
@@ -666,7 +666,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;