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

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

.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";

Docs/manual.texi

@@ -6929,7 +6929,7 @@ install MySQL, create some tables, then reconfigure
 MySQL to use a different character set and reinstall it.)
 
 With the option @code{--with-extra-charset=LIST} you can define
-which additional character sets should be incompiled in the server.
+which additional character sets should be compiled into the server.
 
 Here @code{LIST} is either a list of character
 sets separated with spaces,
@@ -8139,7 +8139,7 @@ version 4.0;
 @code{UNSIGNED} flag on storage (before, @code{UNSIGNED} was ignored for
 these columns).
 @item
-Use @code{ORDER BY column DESC} now always sorts @code{NULL} values
+@code{ORDER BY column DESC} now always sorts @code{NULL} values
 first; in 3.23 this was not always consistent.
 @item
 @code{SHOW INDEX} has 2 columns more (@code{Null} and @code{Index_type})
@@ -8188,8 +8188,8 @@ it is preferable to change the client to use the new 4.0 API.
 @item
 In the @code{MYSQL_FIELD} structure, @code{length} and @code{max_length} have
 changed from @code{unsigned int} to @code{unsigned long}. This should not
-cause any other problems than some warnings if you use these to
-@code{printf()} type function.
+cause any problems, except that they may generate warning messages when
+used as arguments in the @code{printf()} class of functions.
 @item
 You should use @code{TRUNCATE TABLE} when you want to delete all rows
 from a table and you don't care how many rows were deleted.
@@ -8315,8 +8315,8 @@ MySQL Version 3.22 and Version 3.23, you should not use the
 
 @item
 Check all your calls to @code{DATE_FORMAT()} to make sure there is a
-@samp{%} before each format character.  (Later MySQL Version 3.22
-did allow this syntax.)
+@samp{%} before each format character.
+(MySQL Version 3.22 and later already allowed this syntax.)
 
 @item
 @code{mysql_fetch_fields_direct} is now a function (it was a macro) and
@@ -8986,8 +8986,8 @@ You can avoid using @file{libg++.a} by running @code{configure} like this:
 shell> CXX=gcc ./configure
 @end example
 
-If you are running gcc 3.0 and above, you can't use the above trick with
-setting to CXX=gcc.
+If you are running gcc 3.0 or above, you can't use the aforementioned trick
+of setting CXX=gcc.
 
 @node Linux-SPARC, Linux-Alpha, Linux-x86, Linux
 @subsubsection Linux SPARC Notes
@@ -9078,7 +9078,7 @@ work).  You must also use the @code{egcs} C++ compiler
 @node Linux-IA64,  , Linux-MIPS, Linux
 @subsubsection Linux IA64 Notes
 
-To get MySQL to compile on Linux Ia64, we use the following compile line:
+To get MySQL to compile on Linux IA64, we use the following compile line:
 Using @code{gcc-2.96}:
 
 @example
@@ -9088,7 +9088,7 @@ CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors \
 "--with-comment=Official MySQL binary" --with-extra-charsets=complex
 @end example
 
-On Ia64 the MySQL client binaries are using shared libraries. This means
+On IA64 the MySQL client binaries are using shared libraries. This means
 that if you install our binary distribution in some other place than
 @file{/usr/local/mysql} you need to either modify @file{/etc/ld.so.conf}
 or add the path to the directory where you have @file{libmysqlclient.so}
@@ -9368,8 +9368,9 @@ C:\> mysqladmin --user=root --password=your_password shutdown
 
 If you are using the old shareware version of MySQL Version
 3.21 under Windows, the above command will fail with an error:
-@code{parse error near 'SET OPTION password'}.  The fix is in to upgrade
-to the current MySQL version, which is freely available.
+@code{parse error near 'SET OPTION password'}.  The solution for
+this is to download and upgrade to the latest MySQL version,
+which is now freely available.
 
 With the current MySQL versions you can easily add new users
 and change privileges with @code{GRANT} and @code{REVOKE} commands.
@@ -10402,7 +10403,7 @@ PHKL_22840 Streams cumulative
 PHNE_22397 ARPA cumulative
 @end example
 
-This will solve a problem that one gets @code{EWOULDBLOCK} from @code{recv()}
+This will solve the problem of getting @code{EWOULDBLOCK} from @code{recv()}
 and @code{EBADF} from @code{accept()} in threaded applications.
 
 If you are using @code{gcc} 2.95.1 on an unpatched HP-UX 11.x system,
@@ -21535,7 +21536,7 @@ binaries includes:
 @item HP-UX 11.0 @tab N @tab Y
 @item Linux-Alpha @tab N	@tab Y
 @item Linux-Intel @tab Y @tab Y
-@item Linux-Ia64 @tab N @tab Y
+@item Linux-IA64 @tab N @tab Y
 @item Solaris-Intel @tab N @tab Y
 @item Solaris-SPARC @tab Y @tab Y
 @item Caldera (SCO) OSR5 @tab Y @tab Y
@@ -28247,11 +28248,13 @@ A few are reserved because MySQL needs them and is
 
 @c START_OF_RESERVED_WORDS
 
-@multitable @columnfractions .33 .33 .34
-@item @strong{Word} @tab @strong{Word} @tab @strong{Word}
-@c Reserved word list updated Wed May  1 10:50:08 2002 by arjen.
+@c Reserved word list updated Fri May  3 08:41:00 2002 by arjen.
 @c To regenerate, use Support/update-reserved-words.pl.
 
+@multitable @columnfractions .33 .33 .34
+@item @strong{Word}
+ @tab @strong{Word}
+ @tab @strong{Word}
 @item @code{ADD}
  @tab @code{ALL}
  @tab @code{ALTER}
@@ -28436,7 +28439,8 @@ A few are reserved because MySQL needs them and is
  @tab @code{WRITE}
  @tab @code{YEAR_MONTH}
 @item @code{ZEROFILL}
-
+ @tab
+ @tab
 @end multitable
 
 @c END_OF_RESERVED_WORDS
@@ -36491,21 +36495,31 @@ Transactional @code{InnoDB} tables that have been changed will be invalidated
 when a @code{COMMIT} is performed.
 
 A query cannot be cached if it contains one of the functions:
-@multitable @columnfractions .25 .25 .25 .25
-@item @strong{Function} @tab @strong{Function}
- @tab @strong{Function} @tab @strong{Function}
-@item @code{User-Defined Functions} @tab @code{CONNECTION_ID}
- @tab @code{FOUND_ROWS} @tab @code{GET_LOCK}
-@item @code{RELEASE_LOCK} @tab @code{LOAD_FILE}
- @tab @code{MASTER_POS_WAIT} @tab @code{NOW}
-@item @code{SYSDATE} @tab @code{CURRENT_TIMESTAMP}
- @tab @code{CURDATE} @tab @code{CURRENT_DATE}
-@item @code{CURTIME} @tab @code{CURRENT_TIME}
- @tab @code{DATABASE} @tab @code{ENCRYPT} (with one parameter)
-@item @code{LAST_INSERT_ID} @tab @code{RAND}
- @tab @code{UNIX_TIMESTAMP} (without parameters) @tab @code{USER}
-@item @code{BENCHMARK} @tab
- @tab @tab
+@multitable @columnfractions .33 .33 .34
+@item @strong{Function}
+ @tab @strong{Function}
+ @tab @strong{Function}
+@item @code{User-Defined Functions}
+ @tab @code{CONNECTION_ID}
+ @tab @code{FOUND_ROWS}
+@item @code{GET_LOCK}
+ @tab @code{RELEASE_LOCK}
+ @tab @code{LOAD_FILE}
+@item @code{MASTER_POS_WAIT}
+ @tab @code{NOW}
+ @tab @code{SYSDATE}
+@item @code{CURRENT_TIMESTAMP}
+ @tab @code{CURDATE}
+ @tab @code{CURRENT_DATE}
+@item @code{CURTIME}
+ @tab @code{CURRENT_TIME}
+ @tab @code{DATABASE}
+@item @code{ENCRYPT} (with one parameter)
+ @tab @code{LAST_INSERT_ID}
+ @tab @code{RAND}
+@item @code{UNIX_TIMESTAMP} (without parameters)
+ @tab @code{USER}
+ @tab @code{BENCHMARK}
 @end multitable
 
 Nor can a query be cached if it contains user variables,
@@ -51224,7 +51238,7 @@ Fixed that open transactions in @code{BDB} tables are rolled back if the
 connection is closed unexpectedly.
 @item
 Added workaround for a bug in @code{gcc} 2.96 (intel) and @code{gcc} 2.9
-(Ia64) in @code{gen_lex_hash.c}.
+(IA64) in @code{gen_lex_hash.c}.
 @item
 Fixed memory leak in the client library when using @code{host=} in the
 @file{my.cnf} file.

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.