bzr commit into mysql-5.5.0-next-mr-runtime branch (kostja:2919) Bug#34818

[Konstantin Osipov]

#At file:///opt/local/work/next-mr-kostja/ based on
revid:kostja@stripped

 2919 Konstantin Osipov	2009-10-14
      Backport of:
      ----------------------------------------------------------
      revno: 2630.22.31
      committer: Konstantin Osipov <kostja@stripped>
      branch nick: mysql-6.0-runtime
      timestamp: Thu 2008-10-02 19:08:09 +0400
      message:
        Bug #34818 --default-table-type option should be removed
        Remove the deprecated option.
     @ sql/mysqld.cc
        Remove a deprecated option.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-10-12 13:35:30 +0000
+++ b/sql/mysqld.cc	2009-10-14 11:34:20 +0000
@@ -5805,10 +5805,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 },


Attachment: [text/bzr-bundle] bzr/[e-mail]