bzr commit into mysql-trunk branch (Dmitry.Lenev:3348)

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-trunk-cleanup/ based on revid:sergey.glukhov@stripped

 3348 Dmitry Lenev	2011-03-30
      Small clean-up.
      
      Removed members of TABLE_LIST structure which are no longer
      and/or not yet used.
      
      Removed comment referencing unused TABLE_LIST::db_type member
      which is no longer relevant.

    modified:
      sql/sql_table.cc
      sql/table.h
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-03-28 08:10:39 +0000
+++ b/sql/sql_table.cc	2011-03-30 11:43:32 +0000
@@ -2394,10 +2394,6 @@ int mysql_rm_table_no_locks(THD *thd, TA
     else
     {
       char *end;
-      /*
-        Cannot use the db_type from the table, since that might have changed
-        while waiting for the exclusive name lock.
-      */
       if (frm_db_type == DB_TYPE_UNKNOWN)
       {
         dd_frm_type(thd, path, &frm_db_type);

=== modified file 'sql/table.h'
--- a/sql/table.h	2011-03-25 13:28:19 +0000
+++ b/sql/table.h	2011-03-30 11:43:32 +0000
@@ -1664,7 +1664,6 @@ struct TABLE_LIST
   bool          check_option_processed;
   /* FRMTYPE_ERROR if any type is acceptable */
   enum frm_type_enum required_type;
-  handlerton	*db_type;		/* table_type for handler */
   char		timestamp_buffer[20];	/* buffer for timestamp (19+1) */
   /*
     This TABLE_LIST object is just placeholder for prelocking, it will be
@@ -1684,9 +1683,6 @@ struct TABLE_LIST
     /* Don't associate a table share. */
     OPEN_STUB
   } open_strategy;
-  /* For transactional locking. */
-  int           lock_timeout;           /* NOWAIT or WAIT [X]               */
-  bool          lock_transactional;     /* If transactional lock requested. */
   bool          internal_tmp_table;
   /** TRUE if an alias for this table was specified in the SQL. */
   bool          is_alias;


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