merge with 4.0 to get last fixes to last merge

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  merge with 4.0

3 files changed, 15 insertions, 15 deletions

diff --git a/Docs/ManualStyleGuidelines.wiki b/Docs/ManualStyleGuidelines.wiki
index 3329370411c..9d2a869ba1a 100644
--- a/Docs/ManualStyleGuidelines.wiki
+++ b/Docs/ManualStyleGuidelines.wiki
@@ -1,12 +1,13 @@
-OriginalAuthor: PaulDuBois
+OriginalAuthor: Paul DuBois
 
 !!! ManualStyleGuidelines
 
-''Version 1.0''
+''Version 1.1''
 
 !! Revision History
 
 * 2002-05-17 ArjenLentz - Version 1.0, Posted to Wiki
+* 2002-06-03 ArjenLentz - Version 1.1, updates.
 
 !! MySQL Manual Style Guidelines
 
@@ -277,3 +278,5 @@ Logical NOT/OR/AND are operators, not functions, so they take operands, not argu
 
 It's NetWare, not Netware (as per Novell's trademark guidelines).
 
+It's deprecated, not depricated.
+
diff --git a/Docs/manual.texi b/Docs/manual.texi
index c22f8f2152b..97a63abd8c5 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -14341,7 +14341,7 @@ privilege.
 
 @item --skip-stack-trace
 Don't write stack traces.  This option is useful when you are running
-@code{mysqld} under a debugger. On some system you also have to use
+@code{mysqld} under a debugger. On some systems you also have to use
 this option to get a core file. @xref{Debugging server}.
 
 @item --skip-thread-priority
@@ -22662,9 +22662,12 @@ Overrides option --databases (-B).
 @item  -T, --tab=path-to-some-directory
 Creates a @code{table_name.sql} file, that contains the SQL CREATE commands,
 and a @code{table_name.txt} file, that contains the data, for each give table.
-@strong{Note}: This only works if @code{mysqldump} is run on the same
-machine as the @code{mysqld} daemon.  The format of the @file{.txt} file
-is made according to the @code{--fields-xxx} and @code{--lines--xxx} options.
+The format of the @file{.txt} file is made according to the
+@code{--fields-xxx} and @code{--lines--xxx} options.
+@strong{Note}: This option only works if @code{mysqldump} is run on the same
+machine as the @code{mysqld} daemon, and the user/group that @code{mysqld}
+is running as (normally user @code{mysql}, group @code{mysql}) needs to have
+permission to create/write a file at the location you specify.
 @item -u user_name, --user=user_name
 The MySQL user name to use when connecting to the server. The
 default value is your Unix login name.
@@ -49340,6 +49343,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
 
 @itemize @bullet
 @item
+Fixed that @code{ALTER TABLE table_name RENAME new_table_name} is as fast
+as @code{RENAME TABLE}.
+@item
 Fixed bug in @code{GROUP BY} with two or more fields, where at least one
 field can contain @code{NULL} values.
 @item
diff --git a/Docs/mirrors.texi b/Docs/mirrors.texi
index 6042d168316..1082f7d9f09 100644
--- a/Docs/mirrors.texi
+++ b/Docs/mirrors.texi
@@ -72,10 +72,6 @@ FTP (@uref{ftp://mir1.ovh.net/ftp.mysql.com/})
 WWW (@uref{http://www.mysql.netsample.com/})
 
 @item
-@image{Flags/france} France [Omegatomic] @@
-WWW (@uref{http://mysql.omegatomic.com/})
-
-@item
 @image{Flags/france} France [Universite Paris 10] @@
 WWW (@uref{http://ftp.u-paris10.fr/mysql.com})
 FTP (@uref{ftp://ftp.u-paris10.fr/mysql.com})
@@ -270,10 +266,6 @@ FTP (@uref{ftp://mysql.unam.mx/pub/mysql/})
 WWW (@uref{http://mysql.adgrafix.com/})
 
 @item
-@image{Flags/usa} USA [Fast Mirror / Englewood, CO] @@
-WWW (@uref{http://mysql.fastmirror.com/})
-
-@item
 @image{Flags/usa} USA [Hurricane Electric / San Jose, CA] @@
 WWW (@uref{http://mysql.he.net/})
 
@@ -432,4 +424,3 @@ FTP (@uref{ftp://ftp.is.co.za/linux/mysql/})
 
 @end itemize
 
-