bzr commit into mysql-6.0 branch (kostja:2719) Bug#34818

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.0-runtime/

 2719 Konstantin Osipov	2008-10-02
      Bug #34818 --default-table-type option should be removed
      Remove the deprecated option.
modified:
  sql/mysqld.cc

per-file messages:
  sql/mysqld.cc
    Remove the deprecated option.
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-08-26 15:01:13 +0000
+++ b/sql/mysqld.cc	2008-10-02 15:08:09 +0000
@@ -5902,10 +5902,6 @@ struct my_option my_long_options[] =
    "Set the default storage engine (table type) for tables.",
    (uchar**)&default_storage_engine_str, (uchar**)&default_storage_engine_str,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"default-table-type", OPT_STORAGE_ENGINE,
-   "(deprecated) Use --default-storage-engine.",
-   (uchar**)&default_storage_engine_str, (uchar**)&default_storage_engine_str,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"default-time-zone", OPT_DEFAULT_TIME_ZONE, "Set the default time zone.",
    (uchar**) &default_tz_name, (uchar**) &default_tz_name,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },