Merge stella.local:/home2/mydev/mysql-4.1-amain

into  stella.local:/home2/mydev/mysql-4.1-axmrg

Docs/INSTALL-BINARY

+
+You can find information about how to install binary distributions at
+
+  http://dev.mysql.com/doc/refman/4.1/en/quick-standard-installation.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

Docs/Makefile.am

@@ -14,14 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-noinst_SCRIPTS =	Support/generate-text-files.pl
-
-EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY
-
-TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE \
-			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
-
-all-local:		$(TXT_FILES)
+EXTRA_DIST =		mysql.info INSTALL-BINARY
 
 # make sure that "make install" installs the info page, too
 # automake only seems to take care of this automatically,
@@ -33,26 +26,5 @@ install-data-hook:	$(srcdir)/mysql.info
 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:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@
-
-../INSTALL-WIN-SOURCE:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "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:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@
-
-../support-files/MacOSX/ReadMe.txt:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%

Docs/Support/generate-text-files.pl

-#!/usr/bin/perl -w -*- perl -*-
-# Generate text files from top directory from the manual.
-
-$from = shift(@ARGV);
-$fnode = shift(@ARGV);
-$tnode = shift(@ARGV);
-
-open(IN, "$from") || die "Cannot open $from: $!";
-
-$in = 0;
-
-while (<IN>)
-{
-  if ($in)
-  {
-    if (/Node: $tnode,/ || /\[index/)
-    {
-      $in = 0;
-    }
-    elsif (/^File: mysql.info/ || (/^/))
-    {
-      # Just Skip node beginnings
-    }
-    else
-    {
-      print;
-    }
-  }
-  else
-  {
-    if (/Node: $fnode,/)
-    {
-      $in = 1;
-      # Skip first empty line
-      <IN>;
-    }
-  }
-}
-
-close(IN);
-
-die "Could not find node \"$tnode\"" if ($in == 1);
-exit 0;

Docs/mysql.info

-This is mysql.info, produced by makeinfo version 4.8 from manual.texi.
 
-START-INFO-DIR-ENTRY
-* mysql: (mysql).               MySQL documentation.
-END-INFO-DIR-ENTRY
-
-
-File: mysql.info,  Node: Top,  Next: (dir),  Prev: (dir),  Up: (dir)
-
-This is an empty placeholder file for the MySQL manual.
-
-The MySQL manual is now maintained in a separate BitKeeper source tree!
-Please see `http://www.mysql.com/doc/en/Installing_source_tree.html'
-for more info on how to work with BitKeeper.
-
-This file will be replaced with the current `mysql.info' when building
-the official source distribution.
-
-You can find a specific manual for any older version of MySQL in the
-binary or source distribution for that version.
-
-
-
-Tag Table:
-Node: Top166
-
-End Tag Table
+The MySQL Reference Manual is available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

INSTALL-SOURCE

+
+You can find information about how to install from a source distributions at
+
+  http://dev.mysql.com/doc/refman/4.1/en/installing-source.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

INSTALL-WIN-SOURCE

+
+You can find information about how to install from a Windows source
+distributions at
+
+  http://dev.mysql.com/doc/refman/4.1/en/windows-source-build.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

mysql-test/r/bigint.result

@@ -135,3 +135,9 @@ t2.value64=t1.value64;
 value64	value32	value64	value32
 9223372036854775807	2	9223372036854775807	4
 drop table t1, t2;
+create table t1 (sint64 bigint not null);
+insert into t1 values (-9223372036854775808);
+select * from t1;
+sint64
+-9223372036854775808
+drop table t1;

mysql-test/t/bigint.test

@@ -107,4 +107,13 @@ t2.value64=t1.value64;
 
 drop table t1, t2;
 
+# Test for BUG#30069, can't handle bigint -9223372036854775808 on
+# x86_64, with some GCC versions and optimizations.
+
+create table t1 (sint64 bigint not null);
+insert into t1 values (-9223372036854775808);
+select * from t1;
+
+drop table t1;
+
 # End of 4.1 tests

strings/ctype-simple.c

@@ -802,7 +802,7 @@ int my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
   {
     if (val < 0)
     {
-      val= -val;
+      val= -(unsigned long int)val;
       *dst++= '-';
       len--;
       sign= 1;
@@ -838,7 +838,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
   {
     if (val < 0)
     {
-      val = -val;
+      val = -(ulonglong)val;
       *dst++= '-';
       len--;
       sign= 1;

support-files/MacOSX/ReadMe.txt

+
+You can find information about how to install on Mac OS X at
+
+  http://dev.mysql.com/doc/refman/4.1/en/mac-os-x-installation.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.