Commit 32fc6800 authored by unknown's avatar unknown
Browse files

Merge hf@192.168.21.12:work/mysql-4.1.9855 

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg


sql/item_func.cc:
  Auto merged
parents 0f1516b9 f7eefc02

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1057,3 +1057,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

libmysql/libmysql.ver

BUILD/Makefile.am

+16 −2
Original line number Diff line number Diff line
@@ -20,14 +20,22 @@ 
EXTRA_DIST =		FINISH.sh \

			SETUP.sh \

			check-cpu \

			cleanup \

			compile-alpha \

			compile-alpha-ccc \

			compile-alpha-cxx \

			compile-alpha-debug \

			compile-amd64-debug-max \

			compile-amd64-max \

			compile-darwin-mwcc \

			compile-dist \

			compile-hpux11-parisc2-aCC \

			compile-ia64-debug-max \

			compile-irix-mips64-mipspro \

			compile-pentium \

			compile-pentium-debug \

			compile-pentium-debug-max \

			compile-pentium-debug-max-no-embedded \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-gcov \
@@ -36,10 +44,16 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-myodbc \

			compile-pentium-mysqlfs-debug \

			compile-pentium-pgcc \

			compile-pentium-valgrind-max \

			compile-pentium64-debug \

			compile-pentium64-debug-max \

			compile-pentium64-valgrind-max \

			compile-ppc \

			compile-ppc-debug \

			compile-ppc-debug-max \

			compile-ppc-max \

			compile-solaris-sparc \

			compile-solaris-sparc-debug \

			compile-irix-mips64-mipspro \

			compile-hpux11-parisc2-aCC \

			compile-solaris-sparc-forte \

			compile-solaris-sparc-purify

BUILD/compile-pentium64-debug-max

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

BitKeeper/triggers/post-commit

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#shift

FROM=$USER@mysql.com

INTERNALS=internals@lists.mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="4.1"
@@ -61,14 +61,14 @@ EOF 
 ) | head -n $LIMIT | /usr/sbin/sendmail -t



#++

# internals@ mail

# commits@ mail

#--

 echo "Notifying internals list at $INTERNALS"

 echo "Notifying commits list at $COMMITS"

 (

   cat <<EOF

List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

To: $COMMITS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

Docs/Makefile.am

+14 −10
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl 


EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY



all:			txt_files



txt_files:		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt



all-local:		$(TXT_FILES)



# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

# if we're building the info page from texi directly.
@@ -30,28 +30,32 @@ install-data-hook: mysql.info 
	$(mkinstalldirs) $(DESTDIR)$(infodir)

	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)



CLEAN_FILES:		$(txt_files)

	touch $(txt_files)

uninstall-local:

	@RM@ -f $(DESTDIR)$(infodir)/mysql.info



# This target is not used in builds, just for convinience

CLEAN_FILES:		$(TXT_FILES)

	touch $(TXT_FILES)



GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@

	perl -w $(GT) $< "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@

	perl -w $(GT) $< "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@

	perl -w $(GT) $< "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@

	perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@

	perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%