Commit 246c6c35 authored by gluh@eagle.(none)'s avatar gluh@eagle.(none)
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
parents fbac43bb 7491e15f

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

0 → 100755
+26 −0
Original line number Diff line number Diff line 
#!/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

+9 −8
Original line number Diff line number Diff line
@@ -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")

cmd-line-utils/libedit/Makefile.am

+9 −3
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
ASRC =			$(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c

AHDR =			vi.h emacs.h common.h



# Make sure to include stuff from this directory first, to get right "config.h"

INCLUDES =		-I. -I$(top_builddir)/include -I$(top_srcdir)/include

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include



noinst_LIBRARIES =	libedit.a
@@ -31,7 +30,14 @@ EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c 


CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c



DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR 

# Make sure to include stuff from this directory first, to get right "config.h"

# Automake puts into DEFAULT_INCLUDES this source and corresponding

# build directory together with ../../include to let all make files

# find the central "config.h". This variable is used before INCLUDES

# above. But in automake 1.10 the order of these are changed. Put the

# includes of this directory into DEFS to always be sure it is first

# before DEFAULT_INCLUDES on the compile line.

DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR -I. -I$(srcdir)



SUFFIXES = .sh

configure.in

+6 −1
Original line number Diff line number Diff line
@@ -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"

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -879,6 +879,8 @@ extern CHARSET_INFO *get_charset(uint cs_number, myf flags); 
extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);

extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,

					   uint cs_flags, myf my_flags);

extern CHARSET_INFO *get_compatible_charset_with_ctype(CHARSET_INFO

                                                       *original_cs);

extern void free_charsets(void);

extern char *get_charsets_dir(char *buf);

extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);