Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

.bzrignore

@@ -464,3 +464,6 @@ Docs/safe-mysql.xml
 mysys/test_vsnprintf
 Docs/manual.de.log
 Docs/internals.info
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

BUILD/compile-pentium-max

@@ -8,6 +8,7 @@ extra_configs="$pentium_configs"
 strip=yes
 
 extra_configs="$extra_configs --with-innodb --with-berkeley-db \
- --enable-thread-safe-client --with-openssl --with-vio"
+	--with-embedded-server --enable-thread-safe-client \
+	--with-openssl --with-vio"
 
 . "$path/FINISH.sh"

BitKeeper/triggers/post-commit

@@ -59,8 +59,9 @@ EOF
 
 #++
 # docs-commit@ mail
+# Picks up anything under the Docs subdirectory (relevant for docs team).
 #--
- bk changes -v -r+ | grep -q Docs/manual.texi
+ bk changes -v -r+ | grep -q "  Docs/"
  if [ $? -eq 0 ]
  then
   echo "Notifying docs list at $DOCS"

Build-tools/Do-linux-build

 #! /bin/sh
 
 set -e -x
+
+# Only use the "--with-other-libc" parameter, if another libc actually
+# exists, since this will also force static linking, which does not work
+# together with OpenSSL
 OTHER_LIBC_DIR=/usr/local/mysql-glibc
+OTHER_LIBC=""
+if [ -d OTHER_LIBC_DIR ] ; then
+	OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR"
+fi
 
-BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \
+BUILD/compile-pentium-max $OTHER_LIBC \
   --with-comment="Official MySQL Binary"  \
   --prefix=/usr/local/mysql --with-extra-charset=complex \
   --enable-thread-safe-client --enable-local-infile \

Docs/Support/update-reserved-words.pl

@@ -5,6 +5,7 @@
 # 2001-11-20 Fixups by arjen@mysql.com, 2 keywords and 15 synonyms were missing
 # 2001-12-07 Fixup by arjen@mysql.com, add column headings for multitable.
 # 2002-05-01 Fixup by arjen@mysql.com, use 3 columns instead of 4.
+# 2002-05-03 Fixup by arjen@mysql.com, fill last row to full # of columns.
 
 print STDERR "Scanning lex.h for symbols..\n";
 open LEX, "<../sql/lex.h";
@@ -28,11 +29,6 @@ while(($line = <YACC>) =~ /[\s|]+([A-Z_]+)/) {
 close YACC;
 
 
-$list = sprintf("\@c Reserved word list updated %s by %s.\n".
-                "\@c To regenerate, use Support/update-reserved-words.pl.\n\n",
-                &pretty_date, $ENV{USER});
-
-
 print STDERR "Copying reserved words to an array...\n";
 foreach(keys %words) { push @words, $words{$_}; };
 
@@ -42,11 +38,15 @@ print STDERR "Sorting array...\n";
 printf STDERR "There are %i reserved words.\n", scalar @words;
 
 @pre  = ("\@item", " \@tab", " \@tab");
-@post = ("\n", "\n", "\n");
 
+$list = "";
 for($i=0; $word = shift(@words); $i++) {
-  $list .= sprintf "%s %-30s %s", $pre[$i%3], "\@code\{$word\}", $post[$i%3];
-}; $list .= "\n";
+  $list .= sprintf "%s %s\n", $pre[$i%3], "\@code\{$word\}";
+}
+# Fill last row to full # of columns.
+for( ; $i%3; $i++) {
+  $list .= sprintf "%s\n", $pre[$i%3];
+}
 
 open OLD, "<manual.texi";
 open NEW, ">manual-tmp.texi";
@@ -54,10 +54,14 @@ open NEW, ">manual-tmp.texi";
 print STDERR "Copying beginning of manual.texi...\n";
 while(($line = <OLD>) !~ /START_OF_RESERVED_WORDS/) { print NEW $line; };
 print NEW "\@c START_OF_RESERVED_WORDS\n\n";
+printf NEW "\@c Reserved word list updated %s by %s.\n".
+           "\@c To regenerate, use Support/update-reserved-words.pl.\n\n",
+           &pretty_date, $ENV{USER};
+
 print STDERR "Inserting list of reserved words...\n";
 # Ensure the fractions add up to 100% otherwise it looks funny in print:
 print NEW "\@multitable \@columnfractions .33 .33 .34\n";
-print NEW "\@item \@strong{Word} \@tab \@strong{Word} \@tab \@strong{Word}\n";
+print NEW "\@item \@strong{Word}\n \@tab \@strong{Word}\n \@tab \@strong{Word}\n";
 print NEW $list;
 print NEW "\@end multitable\n";
 print STDERR "Skipping over old list...\n";

Makefile.am

@@ -17,7 +17,7 @@
 # Process this file with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS =	foreign
-TAR =			gtar
+
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE README \
 			COPYING COPYING.LIB MIRRORS

configure.in

@@ -364,6 +364,9 @@ AC_PATH_PROG(SED, sed, sed)
 AC_PATH_PROG(CMP, cmp, cmp)
 AC_PATH_PROG(CHMOD, chmod, chmod)
 AC_PATH_PROG(HOSTNAME, hostname, hostname)
+# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and
+# fall back to 'tar' otherwise and hope that it's a GNU tar as well
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
 dnl We use a path for perl so the script startup works
 dnl We make sure to use perl, not perl5, in hopes that the RPMs will
 dnl not depend on the perl5 binary being installed (probably a bug in RPM)

include/Makefile.am

@@ -18,7 +18,7 @@
 BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
 pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \
 			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
-		        my_pthread.h my_no_pthread.h raid.h errmsg.h \
+		  my_semaphore.h my_pthread.h my_no_pthread.h raid.h errmsg.h \
 			my_global.h my_net.h my_alloc.h\
 			sslopt-case.h sslopt-longopts.h sslopt-usage.h \
 			sslopt-vars.h $(BUILT_SOURCES)

strings/Makefile.am

@@ -45,7 +45,8 @@ EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c \
                         ctype-gb2312.c ctype-gbk.c ctype-sjis.c \
                         ctype-tis620.c ctype-ujis.c ctype-latin1_de.c \
                         ctype_autoconf.c \
-                        strto.c strings-x86.s longlong2str-x86.s \
+                        strto.c strings-x86.s \
+			longlong2str.c longlong2str-x86.s \
 			strxmov.c bmove_upp.c strappend.c strcont.c strend.c \
 			strfill.c strcend.c is_prefix.c strstr.c strinstr.c \
 			strmake.c strnmov.c strmov.c strnlen.c \

support-files/mysql.server.sh

@@ -13,6 +13,18 @@
 # chkconfig: 2345 90 90
 # description: A very fast and reliable SQL database engine.
 
+# Comments to support LSB init script conventions
+### BEGIN INIT INFO
+# Provides: mysql
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:  3 5
+# Default-Stop: 3 5
+# Short-Description: start and stop MySLQ
+# Description: MySQL is a very fast and reliable SQL database engine.
+### END INIT INFO
+ 
+
 # The following variables are only set for letting mysql.server find things.
 # If you want to affect other MySQL variables, you should make your changes
 # in the /etc/my.cnf or other configuration files.