bk commit into 4.1 tree (bldsql:1.2390)

[kvishwanatha]

Below is the list of changes that have just been committed into a local
4.1 repository of bldsql. When bldsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2390 05/08/24 13:10:34 bldsql@stripped +2 -0
  Merge bk://mysql.bkbits.net/mysql-4.1
  into  blr-naas-nwl03.blr.novell.com:/home/bldsql/bk/mysql-4.1-cm

  sql/mysqld.cc
    1.587 05/08/24 13:10:27 bldsql@stripped +0 -1
    Auto merged

  include/config-netware.h
    1.8 05/08/24 13:10:27 bldsql@stripped +0 -12
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bldsql
# Host:	blr-naas-nwl03.blr.novell.com
# Root:	/home/bldsql/bk/mysql-4.1-cm/RESYNC

--- 1.586/sql/mysqld.cc	2005-08-18 14:18:22 +05:30
+++ 1.587/sql/mysqld.cc	2005-08-24 13:10:27 +05:30
@@ -4328,7 +4328,7 @@
    (gptr*) &default_collation_name, (gptr*) &default_collation_name,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   {"default-storage-engine", OPT_STORAGE_ENGINE,
-   "Set the default storage engine (table tyoe) for tables.", 0, 0,
+   "Set the default storage engine (table type) for tables.", 0, 0,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"default-table-type", OPT_STORAGE_ENGINE,
    "(deprecated) Use --default-storage-engine.", 0, 0,