Commit fe937a2b authored by unknown's avatar unknown
Browse files

Merge with 4.0 


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Auto merged
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Auto merged
BitKeeper/deleted/.del-message.mc:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  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/m_string.h:
  Auto merged
include/my_getopt.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
strings/strto.c:
  Auto merged
strings/strtol.c:
  Auto merged
strings/strtoll.c:
  Auto merged
strings/strtoull.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
parents 8122a679 38105ee8

Build-tools/Bootstrap

+6 −4
Original line number Diff line number Diff line
@@ -123,14 +123,16 @@ if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run)) 
if ($opt_pull)

{

	&logger("Updating BK tree $REPO to latest ChangeSet first");

	$command= "cd $REPO; bk pull; cd ..";

	&run_command($command, "Could not update $REPO!");

  chdir ($REPO) or &abort("Could not chdir to $REPO!");

	&run_command("bk pull", "Could not update $REPO!");

  chdir ($PWD) or &abort("Could not chdir to $PWD!");



	unless ($opt_skip_manual)

	{

		&logger("Updating manual tree in $opt_docdir");

		$command= "cd $opt_docdir; bk pull; cd ..";

		&run_command($command, "Could not update $opt_docdir!");

    chdir ($opt_docdir) or &abort("Could not chdir to $opt_docdir!");

	  &run_command("bk pull", "Could not update $opt_docdir!");

    chdir ($PWD) or &abort("Could not chdir to $PWD!");

	}

}

client/mysql.cc

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

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

    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, 0)))

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

  {

    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, NULL)))

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

    exit(ho_error);



  return 0;

client/mysqlcheck.c

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


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



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

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

    exit(ho_error);



  if (!what_to_do)