merge

BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok

@@ -22,11 +22,14 @@ jcole@tetra.spaceapes.com
 jorge@linux.jorge.mysql.com
 kaj@work.mysql.com
 lenz@kallisto.mysql.com
+lenz@mysql.com
 miguel@hegel.local
 miguel@light.local
 monty@bitch.mysql.fi
 monty@donna.mysql.fi
 monty@hundin.mysql.fi
+monty@narttu.
+monty@narttu.mysql.fi
 monty@tik.mysql.fi
 monty@tramp.mysql.fi
 monty@work.mysql.com
@@ -53,4 +56,3 @@ tonu@x3.internalnet
 venu@work.mysql.com
 zak@balfor.local
 zak@linux.local
-lenz@mysql.com

Docs/manual.texi

@@ -6182,6 +6182,9 @@ and are configured with the following compilers and options:
 
 @item BSDI BSD/OS 2.1 i386 with @code{gcc} 2.7.2
 @code{CC=gcc CXX=gcc CXXFLAGS=-O3 ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex}
+
+@item FreeBSD 4.4-stable i386 with @code{gcc} 2.95.3
+@code{CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql "--with-comment=Official MySQL binary" --with-extra-charsets=complex "--with-server-suffix=" --enable-thread-safe-client --enable-local-infile --enable-assembler --with-named-z-libs=not-used --disable-shared}
 @end table
 
 Anyone who has more optimal options for any of the preceding
@@ -6831,7 +6834,9 @@ shell> CC=gcc CXX=gcc ./configure
 @end example
 
 When you use @code{gcc} as your C++ compiler, it will not attempt to link in
-@code{libg++} or @code{libstdc++}.
+@code{libg++} or @code{libstdc++}.  This may be a good idea to do even if you
+have the above libraries installed, as some versions of these libraries have
+caused strange problems for MySQL users in the past.
 
 Here are some common environment variables to set depending on
 the compiler you are using:
@@ -7186,7 +7191,11 @@ This works because @code{gcc} compiles C++ sources as well as @code{g++}
 does, but does not link in @code{libg++} or @code{libstdc++} by default.
 
 Another way to fix these problems, of course, is to install @code{g++},
-@code{libg++}, and @code{libstdc++}.
+@code{libg++}, and @code{libstdc++}.  We would however like to recommend
+you to not use @code{libg++} or @code{libstdc++} with MySQL as this will
+only increase the binary size of mysqld without giving you any benefits.
+Some versions of these libraries have also caused strange problems for
+MySQL users in the past.
 
 @item
 If your compile fails with errors, such as any of the following,
@@ -8986,9 +8995,6 @@ 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 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
 
@@ -15167,7 +15173,7 @@ before.
 One can disable all @code{LOAD DATA LOCAL} commands in the MySQL server
 by starting @code{mysqld} with @code{--local-infile=0}.
 
-In the case that @code{LOAD DATA INFILE} is disabled in the server or
+In the case that @code{LOAD DATA LOCAL INFILE} is disabled in the server or
 the client, you will get the error message (1148):
 
 @example
@@ -19681,12 +19687,12 @@ very little resources.
 @item @code{ft_min_word_len}
 The minimum length of the word to be included in a @code{FULLTEXT} index.
 @strong{Note: @code{FULLTEXT} indexes must be rebuilt after changing
-this variable.}
+this variable.} (This option is new for MySQL 4.0).
 
 @item @code{ft_max_word_len}
 The maximum length of the word to be included in a @code{FULLTEXT} index.
 @strong{Note: @code{FULLTEXT} indexes must be rebuilt after changing
-this variable.}
+this variable.} (This option is new for MySQL 4.0).
 
 @item @code{ft_max_word_len_sort}
 The maximum length of the word in a @code{FULLTEXT} index
@@ -22442,7 +22448,8 @@ tables.
 @item -K, --disable-keys
 @code{/*!40000 ALTER TABLE tb_name DISABLE KEYS */;} and
 @code{/*!40000 ALTER TABLE tb_name ENABLE KEYS */;}
-will be put in the output.
+will be put in the output.  This will make loading the data into a MySQL
+4.0 server faster as the index are created after all data are inserted.
 @item -n, --no-create-db
 @code{CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;} will not be put in the
 output. The above line will be added otherwise, if --databases or
@@ -36371,8 +36378,8 @@ unless you know what you are doing!
 @item
 The minimum length of words to be indexed is defined by the MySQL
 variable @code{ft_min_word_length}. @xref{SHOW VARIABLES}.
-Change it to the value you prefer, and rebuild
-your @code{FULLTEXT} indexes.
+Change it to the value you prefer, and rebuild your @code{FULLTEXT} indexes.
+(This is only available for MySQL 4.0)
 
 @item
 The stopword list is defined in @file{myisam/ft_static.c}
@@ -44222,9 +44229,9 @@ shell> ./configure --enable-thread-safe-client
 @end example
 
 This will create a thread-safe client library @code{libmysqlclient_r}.
-@code{--enable-thread-safe-client}.  This library is thread-safe per
-connection.  You can let two threads share the same connection with
-the following caveats:
+(Assuming your OS has a thread safe @code{gethostbyname_r()} function)
+This library is thread-safe per connection.  You can let two threads
+share the same connection with the following caveats:
 
 @itemize @bullet
 @item