Commit a88ab457 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
tests/client_test.c:
  Auto merged
parents 3c3db073 762bee96

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!");

	}

}

Build-tools/mysql-copyright

+13 −13
Original line number Diff line number Diff line
@@ -153,14 +153,14 @@ sub fix_mysql_version 
  chdir("$destdir");

  my $header_file= (-f 'include/mysql_version.h.in')? 'include/mysql_version.h.in' : 'include/mysql_version.h';



    open(MYSQL_VERSION,"<$header_file") or die "Unable to open include/mysql_version.h for read: $!\n";

  open(MYSQL_VERSION,"<$header_file") or die "Unable to open $header_file for read: $!\n";

  undef $/;

  my $mysql_version= <MYSQL_VERSION>;

  close(MYSQL_VERSION);



  $mysql_version=~ s/\#define LICENSE[\s\t]+GPL/#define LICENSE Commercial/;



    open(MYSQL_VERSION,">$header_file") or die "Unable to open include/mysql_version.h for write: $!\n";

  open(MYSQL_VERSION,">$header_file") or die "Unable to open $header_file for write: $!\n";

  print MYSQL_VERSION $mysql_version;

  close(MYSQL_VERSION);

  chdir("$cwd");

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;