From: kevin.lewis
Date: December 23 2010 10:50pm
Subject: bzr commit into mysql-5.1-innodb branch (kevin.lewis:3671) Bug#43818
List-Archive: http://lists.mysql.com/commits/127568
X-Bug: 43818
Message-Id: <20101223225008.B12D695AE7F@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2122966710=="

--===============2122966710==
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:marko.makela@stripped

 3671 kevin.lewis@stripped	2010-12-23
      Bug#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:marko.makela@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;


--===============2122966710==
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: 2834e70c319fa17344d568744976a1b63e671eef
# timestamp: 2010-12-23 16:50:08 -0600
# base_revision_id: marko.makela@stripped\
#   1yxxzzgqtem8bcm7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfG+d7AAAdvfgEAQWWf//3vv
3yC////0UAR5JpC0mbzpqDCSlME0yZCNG0aIPRqA9I0yZBiMm1NNASkE0yZMRopGaNTamgZBkAG0
gAAJJJgU0wIyU8JtJqnpHpqHqYCDE0DTQ0OMmTJiMTACZMEyAGjCMAQwCSQpqeiemjKaMjymmjyE
A0ABoADTRwtxgYY8JEHfH3fM2zktiyPZr2eSyQifF3F1Iwg7AQOFuhLb7bmZg/b4HyfKyx0E85ta
2kB2v6C993TS7tX9rdIPnbt/dg8t92RPptNtqBOqZbWxzIs6tz81+SfDjKjBbsUYMrUVw1twmFUi
IryuCwXZjBRglpOwComNklxQJFaWa6dBfgLKFkp+EAL28x4WG4RBCixB2lUYNeYb+4meNFRVtl42
nRhmaR9cgXoYt7CnPFa1F8HIItS9l2Ot2l5knrM/zLGGHRadrM6PKZFIY6KFiXJlNFiEXJ2KmgzM
RVxAhm4UQse6D3BvRWYijp3ipcotOO041ijlvafB9F1+gu7O0s17pp02qFR52et15iUvIpDJzDUa
I9ao8hNd5++PhNmFihDt1JtFW/is78zlDIyAbBgLWcEoupow0Nxsg5yyjrmyhNFzol0qXwFnca0u
bolo+Ft2bp1uJzSxYnzk1Uhxkp6tWTGMLSimN85JV7tAJsxqOTIaJrR8i5cjbzxg44lvY/G3Y2qR
SKtgpuTUaJEJ0bzrt9Zbnq82aq8v29BU5Jkv1VOOka3ptBsQWIWMTDWGWWlcFuVKpfiKdTtaCgXu
pK8Hj/km8AtV0Nq/x6fWzzCxal81XrGnWqq60EXIIv27kEIpzlJBFaoSQMqf6z7VRTQMqMtO3NF7
I1Qmalk8hwO6roFlOs8SBe0IemZIfejaCJaYLL7kfbKoUPo4MHlGpovDzNGVW/h2ILJjxC41y5yU
zOuHJ8kqTIpv1Xs3YVYpEN6YIg1oVDgUlc9vXCr8UcilpmP3mCT2miPe53KnJgihAl2KnQ38RDm3
LzOFcYhHmhZzWimr89/LNfDW2Uj4w79Um78nEVtWND/kywfuz0s51dlhIlaCCVlWyxeHXckxecVl
OFiEpc0aFVVgJPooRAMbrTsukV83UXdtXqjarHbgSyP61AUT9ZDqGMJO5b+zOmNYS5aE0RyJRKYI
rN5QGm+25WqhOoFanSrhYTyyR0zDF8YUKV7nKNdL4SroFGmVASA9wPTKtVcKZSpDEz8yVguWTeFM
PwOMcLGIRIrYWlOpgrjVcV5XFhGycylm+quQyTKrylSkwNUn1I9+jh6qGUpmknREyZQiTBUp3kWH
XBaiMsCM0pGIHBwcqLDqJ+vmscc2ZPJc4qS5ajjKdj9ou8VBU855FZwberhnJLm9bPEci7ptJ9ZR
VAwv3RvmRDkuSWb+NSU8n38GKwvFIHSXXu7mgp7ypxqKKC1I2XrZsqd1LlO8IP3rCB9WbvGWuiyt
HhUFgPZXaZ+rpkT0yFRdDcke2sL0zJmqS9AvvHLkuCxXq2qBoTWAn5HUnX1IL/F3JFOFCQ8b53sA


--===============2122966710==--