Merge trift2.:/MySQL/M50/mysql-5.0

into  trift2.:/MySQL/M50/push-5.0

BitKeeper/triggers/pre-commit.check-case.pl

+#!/usr/bin/perl
+my $status = 0;
+
+my $pending = $ENV{'BK_PENDING'};
+exit 0 unless -f $pending;
+
+open FI, "<", $pending || exit 0;
+while(<FI>) {
+	my ($file, $stuff) = split /\|/, $_, 2;
+	next unless -f $file;
+	$file =~ s/^(.*)\/([^\/]*)$/$2/;
+	my $path = $1;
+	opendir DIR, $path;
+	my @files = sort map { lc } readdir DIR;
+	closedir DIR;
+	my %count = ();
+	$count{$_}++ for @files;
+	@files = grep { $count{$_} > 1 } keys %count;
+	if(@files > 0) {
+		print "$path/$file: duplicate file names: " . (join " ", @files) . "\n";
+		$status = 1;
+	}
+}
+close FI;
+
+exit $status;

CMakeLists.txt

@@ -109,6 +109,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT       ${CMAKE_CXX_FLAGS_INIT})
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
 
+    # Disable automatic manifest generation.
+    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
+    	   ${CMAKE_EXE_LINKER_FLAGS})
+    # Explicitly disable it since it is the default for newer versions of VS
+    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
+    IF(NOT tmp_manifest)
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+    ENDIF(NOT tmp_manifest)
+
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
       CMAKE_GENERATOR MATCHES "Visual Studio 8")
 
@@ -156,14 +165,6 @@ IF(EMBED_MANIFESTS)
         MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
     ENDIF(HAVE_SIGN_TOOL)
 
-    # Disable automatic manifest generation.
-    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
-    	   ${CMAKE_EXE_LINKER_FLAGS})
-    # Explicitly disable it since it is the default for newer versions of VS
-    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
-    IF(NOT tmp_manifest)
-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    ENDIF(NOT tmp_manifest)
     # Set the processor architecture.
     IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
     	SET(PROCESSOR_ARCH "amd64") 

configure.in

@@ -124,6 +124,8 @@ case $MACHINE_TYPE in
 esac
 
 # Save some variables and the command line options for mysqlbug
+SAVE_CC="$CC"
+SAVE_CXX="$CXX"
 SAVE_ASFLAGS="$ASFLAGS"
 SAVE_CFLAGS="$CFLAGS"
 SAVE_CXXFLAGS="$CXXFLAGS"
@@ -131,6 +133,8 @@ SAVE_LDFLAGS="$LDFLAGS"
 SAVE_CXXLDFLAGS="$CXXLDFLAGS"
 CONF_COMMAND="$0 $ac_configure_args"
 AC_SUBST(CONF_COMMAND)
+AC_SUBST(SAVE_CC)
+AC_SUBST(SAVE_CXX)
 AC_SUBST(SAVE_ASFLAGS)
 AC_SUBST(SAVE_CFLAGS)
 AC_SUBST(SAVE_CXXFLAGS)
@@ -373,6 +377,7 @@ AC_SUBST(CC)
 AC_SUBST(CFLAGS)
 AC_SUBST(CXX)
 AC_SUBST(CXXFLAGS)
+AC_SUBST(ASFLAGS)
 AC_SUBST(LD)
 AC_SUBST(INSTALL_SCRIPT)
 
@@ -631,7 +636,7 @@ AC_SUBST(NOINST_LDFLAGS)
 
 if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
 then
-  tmp=`nm /usr/lib/libc.a  | grep _nss_files_getaliasent_r`
+  tmp=`nm /usr/lib*/libc.a  | grep _nss_files_getaliasent_r`
   if test -n "$tmp"
   then
      STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

mysql-test/suite/funcs_2/r/innodb_charset.result

@@ -737,7 +737,6 @@ a_ascii	a_len
 44	1
 64	1
 45	1
-60	1
 65	1
 46	1
 66	1
@@ -779,17 +778,18 @@ a_ascii	a_len
 78	1
 59	1
 79	1
-7E	1
 5A	1
 7A	1
-5D	1
 5B	1
 5C	1
+5D	1
 5E	1
 5F	1
+60	1
 7B	1
 7C	1
 7D	1
+7E	1
 7F	1
 80	1
 81	1

mysql-test/suite/funcs_2/r/memory_charset.result

@@ -737,7 +737,6 @@ a_ascii	a_len
 44	1
 64	1
 45	1
-60	1
 65	1
 46	1
 66	1
@@ -779,17 +778,18 @@ a_ascii	a_len
 78	1
 59	1
 79	1
-7E	1
 5A	1
 7A	1
-5D	1
 5B	1
 5C	1
+5D	1
 5E	1
 5F	1
+60	1
 7B	1
 7C	1
 7D	1
+7E	1
 7F	1
 80	1
 81	1

mysql-test/suite/funcs_2/r/myisam_charset.result

@@ -737,7 +737,6 @@ a_ascii	a_len
 44	1
 64	1
 45	1
-60	1
 65	1
 46	1
 66	1
@@ -779,17 +778,18 @@ a_ascii	a_len
 78	1
 59	1
 79	1
-7E	1
 5A	1
 7A	1
-5D	1
 5B	1
 5C	1
+5D	1
 5E	1
 5F	1
+60	1
 7B	1
 7C	1
 7D	1
+7E	1
 7F	1
 80	1
 81	1

mysql-test/suite/funcs_2/r/ndb_charset.result

@@ -737,7 +737,6 @@ a_ascii	a_len
 44	1
 64	1
 45	1
-60	1
 65	1
 46	1
 66	1
@@ -779,17 +778,18 @@ a_ascii	a_len
 78	1
 59	1
 79	1
-7E	1
 5A	1
 7A	1
-5D	1
 5B	1
 5C	1
+5D	1
 5E	1
 5F	1
+60	1
 7B	1
 7C	1
 7D	1
+7E	1
 7F	1
 80	1
 81	1

scripts/Makefile.am

@@ -149,13 +149,19 @@ SUFFIXES = .sh
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\
+	  -e 's!@''SAVE_CC''@!@SAVE_CC@!'\
+	  -e 's!@''SAVE_CXX''@!@SAVE_CXX@!'\
 	  -e 's!@''CC_VERSION''@!@CC_VERSION@!'\
 	  -e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\
 	  -e 's!@''PERL''@!@PERL@!' \
-	  -e 's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'\
-	  -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
+	  -e 's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'\
+	  -e 's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'\
+	  -e 's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
+	  -e 's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'\
+	  -e 's!@''ASFLAGS''@!@ASFLAGS@!'\
+	  -e 's!@''CFLAGS''@!@CFLAGS@!'\
+	  -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\
+	  -e 's!@''LDFLAGS''@!@LDFLAGS@!'\
 	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
 	  -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \

scripts/mysqlbug.sh

@@ -23,7 +23,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
 COMPILATION_COMMENT="@COMPILATION_COMMENT@"
 BUGmysql="mysql@lists.mysql.com"
 # This is set by configure
-COMP_ENV_INFO="CC='@CC@'  CFLAGS='@CFLAGS@'  CXX='@CXX@'  CXXFLAGS='@CXXFLAGS@'  LDFLAGS='@LDFLAGS@'  ASFLAGS='@ASFLAGS@'"
+COMP_CALL_INFO="CC='@SAVE_CC@'  CFLAGS='@SAVE_CFLAGS@'  CXX='@SAVE_CXX@'  CXXFLAGS='@SAVE_CXXFLAGS@'  LDFLAGS='@SAVE_LDFLAGS@'  ASFLAGS='@SAVE_ASFLAGS@'"
+COMP_RUN_INFO="CC='@CC@'  CFLAGS='@CFLAGS@'  CXX='@CXX@'  CXXFLAGS='@CXXFLAGS@'  LDFLAGS='@LDFLAGS@'  ASFLAGS='@ASFLAGS@'"
 CONFIGURE_LINE="@CONF_COMMAND@"
 
 LIBC_INFO=""
@@ -261,7 +262,8 @@ ${ORGANIZATION- $ORGANIZATION_C}
 `test -n "$MACHINE"  && echo "Machine: $MACHINE"`
 `test -n "$FILE_PATHS"  && echo "Some paths: $FILE_PATHS"`
 `test -n "$GCC_INFO"  && echo "GCC: $GCC_INFO"`
-`test -n "$COMP_ENV_INFO"  && echo "Compilation info: $COMP_ENV_INFO"`
+`test -n "$COMP_CALL_INFO"  && echo "Compilation info (call): $COMP_CALL_INFO"`
+`test -n "$COMP_RUN_INFO"   && echo "Compilation info (used): $COMP_RUN_INFO"`
 `test -n "$LIBC_INFO"  && echo "LIBC: $LIBC_INFO"`
 `test -n "$CONFIGURE_LINE"  && echo "Configure command: $CONFIGURE_LINE"`
 `test -n "$PERL_INFO"  && echo "Perl: $PERL_INFO"`