Commit 95772f45 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents e9f33158 a5463c25

Build-tools/Bootstrap

+8 −2
Original line number Diff line number Diff line
@@ -210,10 +210,16 @@ if (-d $target_dir) 
	}

	else

	{

		&logger("Renaming $target_dir to $target_dir.old." . $$);

		# Get the time stamp of "configure.in"

		@stat= stat("$target_dir/configure.in");

		my $mtime= $stat[9];

		my ($sec,$min,$hour,$mday,$mon,$year) = localtime($mtime);

		my $mtime= sprintf("%04d-%02d-%02d-%02d:%02d", $year+1900, $mon+1, $mday, $hour, $min);



		&logger("Renaming $target_dir to $target_dir-$mtime");

		$command= "mv ";

		$command.= "-v " if ($opt_verbose || defined $opt_log);

		$command.= "$target_dir $target_dir.old." . $$;

		$command.= "$target_dir $target_dir-$mtime";

		&run_command($command, "Could not rename $target_dir!");

	}

}

Build-tools/Do-compile

+18 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Sys::Hostname; 
@config_options= ();

@make_options= ();



$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";

$opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";

$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
@@ -17,6 +17,7 @@ GetOptions( 
	"bdb",

	"build-thread=i",

	"bundled-zlib",

	"comment=s",

	"config-env=s" => \@config_env,

	"config-extra-env=s" => \@config_extra_env,

	"config-options=s" => \@config_options,
@@ -111,6 +112,7 @@ $log="$pwd/Logs/$host-$major.$minor$opt_version_suffix.log"; 
$opt_distribution =~ /(mysql[^\/]*)\.tar/;

$ver=$1;

$gcc_version=which("gcc");

$opt_comment= "Official MySQL$opt_version_suffix binary" unless $opt_comment;

if (defined($gcc_version) && ! $opt_config_env)

{

  $tmp=`$gcc_version -v 2>&1`;
@@ -305,7 +307,7 @@ if ($opt_stage <= 1) 
  }



  $prefix="/usr/local/mysql";

  check_system("$opt_config_env ./configure --prefix=$prefix --localstatedir=$prefix/data --libexecdir=$prefix/bin --with-comment=\"Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");

  check_system("$opt_config_env ./configure --prefix=$prefix --localstatedir=$prefix/data --libexecdir=$prefix/bin --with-comment=\"$opt_comment\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");

  if (-d "$pwd/$host/include-mysql")

  {

    safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");
@@ -532,6 +534,10 @@ When running several Do-compile runs in parallel, each build 
should have its own thread ID, so running the test suites

does not cause conflicts with duplicate TCP port numbers.



--comment=<comment>

Replace the default compilation comment that is embedded into

the mysqld binary.



--config-env=<environment for configure>

To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'
@@ -689,16 +695,20 @@ sub abort 


  if ($opt_user)

  {

    $mail_header_file="$opt_tmp/do-command.$$";

    open(TMP,">$mail_header_file");

    # Take the last 40 lines of the build log

    open(LOG, "$log") or die $!;

    my @log= <LOG>;

    close LOG;

    splice @log => 0, -40;

    my $mail_file="$opt_tmp/do-command.$$";

    open(TMP,">$mail_file") or die $!;

    print TMP "From: mysqldev\@$full_host_name\n";

    print TMP "To: $email\n";

    print TMP "Subject: $host($uname): $ver$opt_version_suffix compilation failed\n\n";

    print TMP @log;

    close TMP;

    system("tail -n 40 $log > $log.mail");

    system("cat $mail_header_file $log.mail | $sendmail -t -f $email");

    unlink($mail_header_file);

    unlink("$log.mail");

    system("$sendmail -t -f $email < $mail_file");

    unlink($mail_file);

  }

  exit 1;

}

client/mysqladmin.cc

+1 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ static void usage(void) 
  print_defaults("my",load_default_groups);

  puts("\nWhere command is a one or more of: (Commands may be shortened)\n\

  create databasename	Create a new database\n\

  debug			Instruct server to write debug information to log\n\

  drop databasename	Delete a database and all its tables\n\

  extended-status       Gives an extended status message from the server\n\

  flush-hosts           Flush all cached hosts\n\

client/mysqldump.c

+18 −18
Original line number Diff line number Diff line
@@ -2195,6 +2195,7 @@ static my_bool dump_all_views_in_db(char *database) 
  RETURN

    void

*/



static void get_actual_table_name(const char *old_table_name, 

                                  char *new_table_name, 

                                  int buf_size)
@@ -2202,7 +2203,6 @@ static void get_actual_table_name( const char *old_table_name, 
  MYSQL_RES  *tableRes;

  MYSQL_ROW  row;

  char query[ NAME_LEN + 50 ];



  DBUG_ENTER("get_actual_table_name");



  sprintf( query, "SHOW TABLES LIKE '%s'", old_table_name);
@@ -2213,9 +2213,9 @@ static void get_actual_table_name( const char *old_table_name, 


  tableRes= mysql_store_result( sock );

  row= mysql_fetch_row( tableRes );

	strncpy( new_table_name, row[0], buf_size );

  strmake(new_table_name, row[0], buf_size-1);

  mysql_free_result(tableRes);

} /* get_actual_table_name */

}





static int dump_selected_tables(char *db, char **table_names, int tables)

extra/perror.c

+8 −6
Original line number Diff line number Diff line
@@ -220,10 +220,12 @@ int main(int argc,char *argv[]) 
    */

    msg= strerror(10000);



    /* allocate a buffer for unknown_error since strerror always returns the same pointer 

      on some platforms such as Windows */

    /*

      Allocate a buffer for unknown_error since strerror always returns

      the same pointer on some platforms such as Windows

    */

    unknown_error= malloc(strlen(msg)+1);

    strcpy( unknown_error, msg );

    strmov(unknown_error, msg);



    for ( ; argc-- > 0 ; argv++)

    {