bk commit into 5.2 tree (msvensson:1.2352)

[msvensson]

Below is the list of changes that have just been committed into a local
5.2 repository of msvensson. When msvensson 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@stripped, 2006-12-15 15:08:51+01:00, msvensson@neptunus.(none) +5 -0
  Remove table_type system variable in 5.2

  mysql-test/include/not_ndb_default.inc@stripped, 2006-12-15 15:08:45+01:00, msvensson@neptunus.(none) +1 -1
    Remove table_type system variable in 5.2

  mysql-test/r/warnings.result@stripped, 2006-12-15 15:08:45+01:00, msvensson@neptunus.(none) +1 -2
    Remove table_type system variable in 5.2

  mysql-test/t/warnings.test@stripped, 2006-12-15 15:08:45+01:00, msvensson@neptunus.(none) +3 -2
    Remove table_type system variable in 5.2

  sql/set_var.cc@stripped, 2006-12-15 15:08:45+01:00, msvensson@neptunus.(none) +1 -21
    Remove table_type system variable in 5.2

  sql/set_var.h@stripped, 2006-12-15 15:08:45+01:00, msvensson@neptunus.(none) +0 -11
    Remove table_type system variable in 5.2

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.2-maint

--- 1.2/mysql-test/include/not_ndb_default.inc	2006-12-15 15:09:13 +01:00
+++ 1.3/mysql-test/include/not_ndb_default.inc	2006-12-15 15:09:13 +01:00
@@ -1,4 +1,4 @@
 --require r/not_ndb_default.require
 disable_query_log;
-select convert(@@table_type using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE";
+select convert(@@storage_engine using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE";
 enable_query_log;

--- 1.29/mysql-test/t/warnings.test	2006-12-15 15:09:13 +01:00
+++ 1.30/mysql-test/t/warnings.test	2006-12-15 15:09:13 +01:00
@@ -117,9 +117,10 @@ create table t1 (id int) engine=NDB;
 alter table t1 engine=NDB;
 drop table t1;
 
+
+# Test for removed table_type variable
 #
-# Test for deprecated table_type variable
-#
+--error 1193
 set table_type=MYISAM;
 
 #

--- 1.206/sql/set_var.cc	2006-12-15 15:09:13 +01:00
+++ 1.207/sql/set_var.cc	2006-12-15 15:09:13 +01:00
@@ -449,8 +449,6 @@ sys_updatable_views_with_limit("updatabl
                                &SV::updatable_views_with_limit,
                                &updatable_views_with_limit_typelib);
 
-sys_var_thd_table_type  sys_table_type("table_type",
-				       &SV::table_type);
 sys_var_thd_storage_engine sys_storage_engine("storage_engine",
 				       &SV::table_type);
 #ifdef HAVE_REPLICATION
@@ -1006,7 +1004,6 @@ SHOW_VAR init_vars[]= {
   {"table_definition_cache",  (char*) &table_def_size,              SHOW_LONG},
   {"table_lock_wait_timeout", (char*) &table_lock_wait_timeout,     SHOW_LONG },
   {"table_open_cache",        (char*) &table_cache_size,            SHOW_LONG},
-  {sys_table_type.name,	      (char*) &sys_table_type,	            SHOW_SYS},
   {sys_thread_cache_size.name,(char*) &sys_thread_cache_size,       SHOW_SYS},
 #ifdef HAVE_THR_SETCONCURRENCY
   {"thread_concurrency",      (char*) &concurrency,                 SHOW_LONG},
@@ -3519,7 +3516,7 @@ int set_var_password::update(THD *thd)
 }
 
 /****************************************************************************
- Functions to handle table_type
+ Functions to handle storage_engine
 ****************************************************************************/
 
 /* Based upon sys_var::check_enum() */
@@ -3578,23 +3575,6 @@ bool sys_var_thd_storage_engine::update(
     value= &(thd->variables.*offset);
   *value= var->save_result.hton;
   return 0;
-}
-
-void sys_var_thd_table_type::warn_deprecated(THD *thd)
-{
-  WARN_DEPRECATED(thd, "5.2", "table_type", "'storage_engine'");
-}
-
-void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
-{
-  warn_deprecated(thd);
-  sys_var_thd_storage_engine::set_default(thd, type);
-}
-
-bool sys_var_thd_table_type::update(THD *thd, set_var *var)
-{
-  warn_deprecated(thd);
-  return sys_var_thd_storage_engine::update(thd, var);
 }
 
 

--- 1.93/sql/set_var.h	2006-12-15 15:09:14 +01:00
+++ 1.94/sql/set_var.h	2006-12-15 15:09:14 +01:00
@@ -463,17 +463,6 @@ SHOW_TYPE type() { return SHOW_CHAR; }
   byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base);
 };
 
-class sys_var_thd_table_type :public sys_var_thd_storage_engine
-{
-public:
-  sys_var_thd_table_type(const char *name_arg, handlerton *SV::*offset_arg)
-    :sys_var_thd_storage_engine(name_arg, offset_arg)
-  {}
-  void warn_deprecated(THD *thd);
-  void set_default(THD *thd, enum_var_type type);
-  bool update(THD *thd, set_var *var);
-};
-
 class sys_var_thd_bit :public sys_var_thd
 {
   sys_check_func check_func;

--- 1.54/mysql-test/r/warnings.result	2006-12-15 15:09:14 +01:00
+++ 1.55/mysql-test/r/warnings.result	2006-12-15 15:09:14 +01:00
@@ -174,8 +174,7 @@ Warnings:
 Warning	1266	Using storage engine MyISAM for table 't1'
 drop table t1;
 set table_type=MYISAM;
-Warnings:
-Warning	1541	The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead
+ERROR HY000: Unknown system variable 'table_type'
 create table t1 (a int);
 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 update t1 set a='abc';