From: Date: October 2 2008 5:09pm
Subject: bzr push into mysql-6.0 branch (kostja:2718 to 2719) Bug#34818
List-Archive: http://lists.mysql.com/commits/55103
X-Bug: 34818
Message-Id: <20081002150924.2DB4C4000D@vajra.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

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

 2718 Konstantin Osipov	2008-10-02
      A fix for Bug#37550 SHOW PROCESSLIST displays "copy to tmp table" 
      even this does not happen.
      Only set thd->proc_info if we're about to copy data in ALTER.
modified:
  sql/sql_table.cc

=== 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 },