Commit 30e9a3ec authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean


sql/mysqld.cc:
  Auto merged
parents 1b970e94 cf312a78

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -4328,7 +4328,7 @@ Disable with --skip-bdb (will save memory).", 
   (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,