From: kevin.lewis
Date: January 4 2011 6:34pm
Subject: bzr commit into mysql-5.1-innodb branch (kevin.lewis:3673)
List-Archive: http://lists.mysql.com/commits/127902
Message-Id: <20110104183445.0792096CC3B@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0810768999=="

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

#At file:///Users/kevinlewis/Work/Mysql/Bug43818/mysql-5.1-innodb/ based on revid:calvin.sun@stripped

 3673 kevin.lewis@stripped	2011-01-04
      43818 - Patch for mysql-5.1-innodb
      Avoid handler::info() call for three Information Schema tables;
      TABLE_CONSTRAINTS, KEY_COLUMN_USAGE, & REFERENTIAL_CONTRAINTS

    modified:
      sql/sql_show.cc
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	revid:calvin.sun@stripped
+++ b/sql/sql_show.cc	revid:kevin.lewis@stripped
@@ -4647,9 +4647,10 @@ static int get_schema_constraints_record
     TABLE *show_table= tables->table;
     KEY *key_info=show_table->key_info;
     uint primary_key= show_table->s->primary_key;
-    show_table->file->info(HA_STATUS_VARIABLE | 
-                           HA_STATUS_NO_LOCK |
-                           HA_STATUS_TIME);
+
+    // This is not needed since no statistics are displayed.
+    // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME);
+
     for (uint i=0 ; i < show_table->s->keys ; i++, key_info++)
     {
       if (i != primary_key && !(key_info->flags & HA_NOSAME))
@@ -4831,9 +4832,10 @@ static int get_schema_key_column_usage_r
     TABLE *show_table= tables->table;
     KEY *key_info=show_table->key_info;
     uint primary_key= show_table->s->primary_key;
-    show_table->file->info(HA_STATUS_VARIABLE | 
-                           HA_STATUS_NO_LOCK |
-                           HA_STATUS_TIME);
+
+    // This is not needed since no statistics are displayed.
+    // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME);
+
     for (uint i=0 ; i < show_table->s->keys ; i++, key_info++)
     {
       if (i != primary_key && !(key_info->flags & HA_NOSAME))
@@ -5562,9 +5564,9 @@ get_referential_constraints_record(THD *
   {
     List<FOREIGN_KEY_INFO> f_key_list;
     TABLE *show_table= tables->table;
-    show_table->file->info(HA_STATUS_VARIABLE | 
-                           HA_STATUS_NO_LOCK |
-                           HA_STATUS_TIME);
+
+    // This is not needed since no statistics are displayed.
+    // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME);
 
     show_table->file->get_foreign_key_list(thd, &f_key_list);
     FOREIGN_KEY_INFO *f_key_info;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///Users/kevinlewis/Work/Mysql/Bug43818/mysql-\
#   5.1-innodb/
# testament_sha1: 203d4f7673b7258bc06898e32b2cb97e8d23cf12
# timestamp: 2011-01-04 12:34:44 -0600
# base_revision_id: calvin.sun@stripped\
#   fk3z14fcescee1k5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYFy+LcAAd7fgEAQUWf//3vv
3yC////0UAR0e51Ku29uKe9QuwkpMgj0RqMxNNNFP0UaaAxNqBtHqajPVHpAkomIaCZpomiTR6gA
PUNAaGmgDECSIE0jTSn5IwSZMCD0mnqGgAABoNJQG1AGgAxAGhoeo8kDTJkBoCSVHlNPIjTU9Q09
Jkep6h6gGgAAAANFoYGGO6ke3p+alpBSUz22y220iLqW67qIMdViIGipdHn3zsYwL+B5OjmqIU4t
ZlZRHE2X/C7suu3LsXmq4wv48fTxI1hprWJOTnJ6iW5cXEPUt6t6NmzS13xUDEbZQZq97w4OeeQi
XQqBTKyq4aKzTo/Y42tXSVO5KVIvzCMws4qbrn5JngTtabm/gwm8EgDCZFIsryMSvW4pK22ZGAoM
w6c4MkHfuuHspBdh0SLBMG9gNW02cURdUI0iEKPLHTdwxXaR/eTBctLRTr5MdGh4i8u2riTMd2dx
J+jTfgJ61iIpYxXbm4ck1i6FDQqnvcpY+K0YuWbKinlHdqJOtDZ9JtwxWYuy6syIQYW2WItCH9IK
tUZtJ4pwzEyN7l1alz8iFdThuByrrtWsFeUD6bJjNTeYv1XjE6iD2sSgOnUWrbfhU682KOS+xUrJ
rp5CVm7Ava/Tdcs3KStubPBPCTiice2yNeMeuVUnRoVgmmx6bfOtpkVmpAuL8ygpaRqGdjhZ2XwW
27Oqxrg2NhXCKm6arvIkFLG3rf2nXsyePgUNm7lFTEsaV6w6sBv9TkH6QTkwMLw34L0XmsFhJMYe
EVceIuhUrYDh38TOIXrY/Jdbk6xjjG5RXUrLRlVioyZEE3QTjjwoJTTuqIJq2VEDKv+aOZVViBiO
YrmCyQu75KCNCSlZZgDegwD6TgdUkQTT4BAqywHzhlF19XKrUSOxhSs14PXOfsLOfPGnpGJ4SOfw
igoRLCsmsaMPxTjXfeplD4WqZVQ23ZoGJGJIe0JwyMWZ9UmyOR6jTJHLvr4EDli2FCkkiiuWuxME
D33ykaipi1uM+65sRXBK8N2IfcuK2yLmhTTJbQs3Oy6Qg8YYRcXwsjNphWfRMWE9M+B2mzXJaSSi
D0q1reQ0GsZvOHBZtRMZeXJXXVF6x2FqIQ3QMoJ0U+ufdpKRdJBqCV7e1WwitzoZYwyHNAuijtTG
3HOKAy6BEqmCaetYz82OfG+GypVnSmDCrysky7BQMFw1DGJyyKTzPQag4dQWrsVoXBBwguhdO5Mr
0hjCHOlI6KmcfW5mjuvVYioU9gOdTORxzkxe25YQI1VizOwQGEMRTR7iKqwNBRgj4WORXSMrzC7B
E2TKM0wYDkvBrBTRuiUO5I5gcNjqqz86WXkWfhZlAlySVVYaZ0g8hS3lmltCtGdJcUVd+R0ZeS8s
OaoX7sI3zmHZrWsUWSpjALjiYtC4VAeh0N1dTSVmkg5aVUlELU1QtKhaNxrDEoUA92Jxa3M+Eirm
HBdCUHMr+3nZ3MioO/4ror0GiVaYHweJqUxR5uYcrRYjWSTmohuUdBLSL/i7kinChIQLl8W4


--===============0810768999==--