From: Dmitry Lenev
Date: March 30 2011 11:43am
Subject: bzr commit into mysql-trunk branch (Dmitry.Lenev:3348)
List-Archive: http://lists.mysql.com/commits/134243
Message-Id: <20110330114341.2066E7406AB@bandersnatch>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1754190308=="

--===============1754190308==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============1754190308==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.lenev@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-trunk-cleanup/
# testament_sha1: 1b7d47b89e2693f01918a35ae963fbead9beaa5e
# timestamp: 2011-03-30 15:43:40 +0400
# base_revision_id: sergey.glukhov@stripped\
#   gv9l0kxhy8mrqqmu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW6bmKsAAhBfgAAQUGP/93Yk
HAC////wUATaeADMxEAAEoiNKeJomNpT0E8U8SaBhqepk00MNDQAAAaAAAAAGhE00ygepmk0AAAA
AAw0NAAABoAAAAASSCaAGk0GTSZCE8NImmmjTRgtPiXPN5nEI2yonguwO5k1RoRMjLSuSRLTXTjU
JgZmKqYcE6QOXIuVZlB7MrmwJ1/uPDnizmYubDtIWzjP2hVaaWMTmoYwOXZoqrm2ax9I/P7INVAu
qjIzogmo2Aa9Edc6drzAKpEmIf5OynbkgLXg5MBMrc8q3HXtJBYzMzaNq4gHmnxCAXoUAHMwgi3F
RTamVcgqCSoLj8mlcY71kBgKHhEoD2YIIT7qTd0wkhDyGECGkc521y3BcB9bmLNb75olX6XecaFl
x5ewdbCZqYEjLi8IG3+gcLRgK7ULlbrpkQGN8Kd+pWUQN5xOMUbGBwJS27H/HoSI0JFXgFtg3WIE
CIyRQBieBh2jvCsmcyEzoaltlTrgrpeECcRDJzhx6TesVMxOWtuBsb88CdGjTjSTf9CT5dIm3lew
WFedoPrzyNCZ+ishSwzkNEvIVtSmuMWHql1rLI0AmRfYcQIV6XhXY82NTB6kaTdvMJhYEDeczLDD
kp8zxeYwsGsq4kB5VVc691S0j4qZ7UcEIxIim3FMFQcZgShZCltZRtFEaifB5bXRetMEKGG06jJk
qgDagCSE4hKw6dxapoGecXCCDByG1c6CTkkSqiquBjRhD0DadjR8yHUj7EJKaXmRE572hal/wbyE
SKCsZT3YRie/ERG43mWBCqU4mDdBLJFTY+4qPbi9KtcInTuSMD1OB7ET2LuXu89TuqDA87heW8Dq
vddy+0ucVKnOZTsbM1zmEtPtUJOqzArsC3MdZOfhRxMOo8kEgaelCLrb9AMGN2ypPEy7nwlI6ybl
qJYCW0YIg8zX5/EkqhvAipNJYT2jlZMTISelJuhLYrizdarO9G7PO9dWI7XdbmnW7qwdkO4zlQAs
DU0ooa7F11VVakHPulMXiGaZCRCYHKW10gtbzzOw7I1f5j1Ckmsj7nqe5heZvPT4GmQsmJxvC4/O
46H0DcU4Fh7LgUJvg/JWP6in7HoGC4rwXNs/cbhj+ENH5rMxOAoHO9F2X68N0M0S1R5JDzz4HQ6B
kd7+DVHwHFGciSs2X1WwYIilFnhFelxgOV4kycDjsBRiZ45lugF5zD+BLl+OqtLTfYcpTP2RAhyL
D5FZXUrDAD7LkoXVSb6AeLliQsahEHiHDjz4dSS3mBSVMipgdCTiCnsVbir0s2AKUd+ZQff9iXJF
y7uV+fqGBk3UX9TqNXDBFfaVWxLiQoJbhwFx1LhVKo3L6nMuucDkg+b78SL0sPlBQR6UrA7nCF+S
kSimGQNzxvhlQ8vA7WFKGJBn2PwdGZpGjnFhWjc2/OE3D2PEL1VUT7ARxtDt0LLd+BACIFaLwa3M
RKAOu6mNBScDY6GppbPVUhZDdZhjm4hqOOWJcQXAICGIryHo60+F5nQrTIwqRiDAyDbsrJZypeaK
pZf+LuSKcKEg3TcxVg==


--===============1754190308==--