Commit dc472dca authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1test2
parents 6e667ec8 e1f418e1

BUILD/compile-ia64-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ then 
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi



CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server

CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine

gmake

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ bk@mysql.r18.ru 
brian@avenger.(none)

brian@brian-akers-computer.local

brian@private-client-ip-101.oz.net

brian@zim.(none)

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dellis@goetia.(none)

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

	}

}

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static void write_header(FILE *sql_file, char *db_name) 
");

    }

    fprintf(sql_file,

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=\"%s%s%s\" */;\n",

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n",

	    path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",",

	    compatible_mode_normal_str);

    check_io(sql_file);
@@ -863,7 +863,7 @@ static int dbConnect(char *host, char *user,char *passwd) 
    cannot reconnect.

  */

  sock->reconnect= 0;

  sprintf(buff, "/*!40100 SET @@SQL_MODE=\"%s\" */",

  sprintf(buff, "/*!40100 SET @@SQL_MODE='%s' */",

	  compatible_mode_normal_str);

  if (mysql_query_with_error_report(sock, 0, buff))

  {

mysql-test/r/compare.result

+3 −0
Original line number Diff line number Diff line
@@ -36,3 +36,6 @@ hex(a) STRCMP(a,'a') STRCMP(a,'a ') 
6109	-1	-1

61	0	0

DROP TABLE t1;

SELECT CHAR(31) = '', '' = CHAR(31);

CHAR(31) = ''	'' = CHAR(31)

0	0