Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql

Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok

@@ -2,3 +2,4 @@ mwagner@evoq.mwagner.org
 sasha@mysql.sashanet.com
 heikki@donna.mysql.fi
 miguel@linux.local
+monty@tik.mysql.fi

Docs/manual.texi

@@ -43642,6 +43642,11 @@ Some features:
 @itemize @bullet
 @item Manage servers, databases, tables, columns, indexes, and users
 @item Import wizard to import structure and data from MS Access, MS Excel, Dbase, FoxPro, Paradox, and ODBC Databases.
+
+@item @uref{http://www.mysql.com/Downloads/Contrib/KMYENG113.zip,KMYENG113.zip}
+An administrator GUI for @strong{MySQL}. Works only on windows, no source.
+Available in English and Japanese. By Mitunobu Kaneko.
+Home page: @uref{http://sql.jnts.ne.jp/}
 @end itemize
 
 @item @uref{http://www.mysql.com/Downloads/Contrib/xmysqladmin-1.0.tar.gz, xmysqladmin-1.0.tar.gz}
@@ -43949,6 +43954,11 @@ By Steve Shreeve.
 Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
 @item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
 Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
+
+@item @uref{http://www.mysql.com/Downloads/Contrib/T2S_100.ZIP, T2S_100.ZIP}.
+Windows program to convert text files to @strong{MySQL} databases. By
+Asaf Azulay.
+
 @end itemize
 
 @appendixsec Using MySQL with Other Products

configure.in

@@ -285,8 +285,10 @@ export CC CFLAGS LD LDFLAGS
 
 if test "$GXX" = "yes"
 then
-  # mysqld requires this when compiled with gcc
-  CXXFLAGS="$CXXFLAGS -fno-implicit-templates"
+  # mysqld requires -fno-implicit-templates.
+  # Disable exceptions as they seams to create problems with gcc and threads.
+  # mysqld doesn't use run-time-type-checking, so we disable it.
+  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
 fi
 
 # Avoid bug in fcntl on some versions of linux

scripts/mysql_config.sh

@@ -45,7 +45,7 @@ EOF
         exit 1
 }
 
-if ! test $# -gt 0; then usage; fi
+if test $# -le 0; then usage; fi
 
 while test $# -gt 0; do
         case $1 in

sql/mysqld.cc

@@ -3039,8 +3039,12 @@ static void usage(void)
   --console		Don't remove the console window\n\
   --install		Install mysqld as a service (NT)\n\
   --remove		Remove mysqld from the service list (NT)\n\
-  --standalone		Dummy option to start as a standalone program (NT)\n\
+  --standalone		Dummy option to start as a standalone program (NT)\
 ");
+#ifdef USE_SYMDIR
+  puts("--use-symbolic-links	Enable symbolic link support");
+#endif
+  puts("");
 #endif
 #ifdef HAVE_BERKELEY_DB
   puts("\