Commit e6e98495 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
parents 5725fa5d 7116beb9

Build-tools/Bootstrap

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ if (-d $target_dir) 
		@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);

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

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,
@@ -110,6 +111,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`;
@@ -303,7 +305,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");
@@ -530,6 +532,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'
@@ -684,16 +690,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
@@ -1008,6 +1008,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\

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1677,8 +1677,8 @@ then 
elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

mysql-test/r/func_str.result

+13 −6
Original line number Diff line number Diff line
@@ -325,6 +325,19 @@ trim(trailing 'foo' from 'foo') 
select trim(leading 'foo' from 'foo');

trim(leading 'foo' from 'foo')



select quote(ltrim(concat('    ', 'a')));

quote(ltrim(concat('    ', 'a')))

'a'

select quote(trim(concat('    ', 'a')));

quote(trim(concat('    ', 'a')))

'a'

CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;

SELECT QUOTE('A') FROM t1;

QUOTE('A')

'A'

'A'

'A'

DROP TABLE t1;

select 1=_latin1'1';

1=_latin1'1'

1
@@ -691,12 +704,6 @@ select count(*) as total, left(c,10) as reg from t1 group by reg order by reg de 
total	reg

10	2004-12-10

drop table t1;

select quote(ltrim(concat('    ', 'a')));

quote(ltrim(concat('    ', 'a')))

'a'

select quote(trim(concat('    ', 'a')));

quote(trim(concat('    ', 'a')))

'a'

select trim(null from 'kate') as "must_be_null";

must_be_null

NULL