Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Docs/manual.texi:
  Auto merged

4 files changed, 14 insertions, 15 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 437e4cf38f1..305ed69fce0 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -14135,8 +14135,9 @@ though.
 
 @item --core-file
 Write a core file if @code{mysqld} dies.  For some systems you must also
-specify @code{--core-file-size} to @code{safe_mysqld}. @xref{safe_mysqld, ,
-@code{safe_mysqld}}. Note that on some system like Solaris, you will
+specify @code{--core-file-size} to @code{safe_mysqld}.
+@xref{safe_mysqld, ,@code{safe_mysqld}}.
+Note that on some systems, like Solaris, you will
 not get a core file if you are also using the @code{--user} option.
 
 @item -h, --datadir=path
@@ -29908,8 +29909,8 @@ have any of the values shown here.  The index of each value is also shown:
 
 An enumeration can have a maximum of 65535 elements.
 
-Starting from 3.23.51 end space are automaticly deleted from enum values
-when the table is created.
+Starting from 3.23.51 trailing spaces are automatically deleted from
+@code{ENUM} values when the table is created.
 
 Lettercase is irrelevant when you assign values to an @code{ENUM} column.
 However, values retrieved from the column later have lettercase matching the
@@ -29926,9 +29927,9 @@ mysql> SELECT enum_col+0 FROM tbl_name;
 If you store a number into an @code{ENUM}, the number is treated as an
 index, and the value stored is the enumeration member with that index.
 (However, this will not work with @code{LOAD DATA}, which treats all
-input as strings.).  Becasue of this, it's not advisable to store
-numbers in an enum string (You will be confused sooner or later if you
-do this).
+input as strings.)
+It's not advisable to store numbers in an @code{ENUM} string because
+it will make things confusing.
 
 @code{ENUM} values are sorted according to the order in which the enumeration
 members were listed in the column specification.  (In other words,
@@ -29967,8 +29968,8 @@ any of these values:
 
 A @code{SET} can have a maximum of 64 different members.
 
-Starting from 3.23.51 end space are automaticly deleted from @code{SET}
-values when the table is created.
+Starting from 3.23.51 trailing spaces are automatically deleted from
+@code{SET} values when the table is created.
 
 MySQL stores @code{SET} values numerically, with the low-order bit
 of the stored value corresponding to the first set member.  If you retrieve a
@@ -55872,7 +55873,7 @@ The trace file is made with the @strong{DBUG} package by Fred Fish.
 
 @cindex gdb, using
 
-On most system you can also start @code{mysqld} from @code{gdb} to get
+On most systems you can also start @code{mysqld} from @code{gdb} to get
 more information if @code{mysqld} crashes.
 
 With some older @code{gdb} versions on Linux you must use @code{run
diff --git a/client/mysql.cc b/client/mysql.cc
index 105711bd6a0..10c3709c166 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -502,7 +502,7 @@ static struct my_option my_long_options[] =
    (gptr*) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"column-names", OPT_COLUMN_NAMES, "Write column names in results.",
    (gptr*) &column_names, (gptr*) &column_names, 0, GET_BOOL,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
+   NO_ARG, 1, 0, 0, 0, 0, 0},
   {"skip-column-names", 'N',
    "Don't write column names in results. WARNING: -N is depricated, use long version of this options instead.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
index fef5cdf6661..cd308a53d46 100644
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define MANAGER_PWGEN_VERSION "1.2"
+#define MANAGER_PWGEN_VERSION "1.3"
 
 #include <my_global.h>
 #include <m_ctype.h>
@@ -86,9 +86,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case 'V':
     print_version();
     exit(0);
-  default:
-    usage();
-    exit(1);
   }
   return 0;
 }
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 747a07e71b2..e1345b96627 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -419,6 +419,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
 ****************************************************************************/
 
 #if defined(HPUX) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
+#undef pthread_cond_timedwait
 
 int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
 			      struct timespec *abstime)