From: Alexander Nozdrin
Date: June 9 2011 11:31am
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3174)
List-Archive: http://lists.mysql.com/commits/138944
Message-Id: <201106091131.p59BVNs2001817@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2412897171412366401=="

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

#At file:///home/alik/MySQL/bzr/00/bug55843/mysql-trunk-bug55843-03/ based on revid:alexander.nozdrin@stripped

 3174 Alexander Nozdrin	2011-06-09
      Polishing do_fill_table() in sql_show.cc.

    modified:
      sql/sql_show.cc
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2011-06-09 09:43:53 +0000
+++ b/sql/sql_show.cc	2011-06-09 11:31:14 +0000
@@ -6804,25 +6804,25 @@ static bool do_fill_table(THD *thd,
   // that problem we create a Warning_info instance, which is capable of
   // storing "unlimited" number of warnings.
   Diagnostics_area *da= thd->get_stmt_da();
-  Warning_info wi(thd->query_id, true);
-  Warning_info *wi_saved= thd->get_warning_info();
+  Warning_info wi_tmp(thd->query_id, true);
+  Warning_info *wi= thd->get_warning_info();
 
-  da->set_warning_info(&wi);
+  da->set_warning_info(&wi_tmp);
 
   bool res= table_list->schema_table->fill_table(
     thd, table_list, join_table->condition());
 
-  da->set_warning_info(wi_saved);
+  da->set_warning_info(wi);
 
   // Pass an error if any.
 
-  if (thd->get_stmt_da()->is_error())
+  if (da->is_error())
   {
-    thd->get_warning_info()->push_warning(thd,
-                                          thd->get_stmt_da()->sql_errno(),
-                                          thd->get_stmt_da()->get_sqlstate(),
-                                          MYSQL_ERROR::WARN_LEVEL_ERROR,
-                                          thd->get_stmt_da()->message());
+    wi->push_warning(thd,
+                     da->sql_errno(),
+                     da->get_sqlstate(),
+                     MYSQL_ERROR::WARN_LEVEL_ERROR,
+                     da->message());
   }
 
   // Pass warnings (if any).
@@ -6831,13 +6831,13 @@ static bool do_fill_table(THD *thd,
   // correspond to the errors which were filtered out in fill_table().
 
 
-  List_iterator_fast<MYSQL_ERROR> it(wi.warn_list());
+  List_iterator_fast<MYSQL_ERROR> it(wi_tmp.warn_list());
   MYSQL_ERROR *err;
 
   while ((err= it++))
   {
     if (err->get_level() != MYSQL_ERROR::WARN_LEVEL_ERROR)
-      thd->get_warning_info()->push_warning(thd, err);
+      wi_tmp.push_warning(thd, err);
   }
 
   return res;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   4u9pbbgvcgcvmq60
# target_branch: file:///home/alik/MySQL/bzr/00/bug55843/mysql-trunk-\
#   bug55843-03/
# testament_sha1: b87458fcb0c437ef549ed5f39b28716d4fcb2258
# timestamp: 2011-06-09 15:31:18 +0400
# base_revision_id: alexander.nozdrin@stripped\
#   8vm2z8c0qnhli9y2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWew4lXEAAep/gFAQIABRd///
cgf5oL////BQBFknujVzVCaazYSSQmTAgGFPQRkZJpk9J6E2p6h+qepo9QakjT0R6epqMg9QNDQA
0AyBoyAwShAmII000o/VHqeJGmhoAyNGQADmATATIwAjExMJhMENMTTASSEaE9TBJ6maNJPSbRNo
QaD0gAD1HmPh0Sqo3bifLabs9gLY9kKSpeImk1jHvaR0gsXO1CIMCdTtW333qqgdvYiU4fiM1g/W
52tpKj1goz2RovvRT3MHGnjy/0HKvPkjZSMd8ma3RVTiMMQ5ha4n5WrZ4wmQuegxWX0oJXyOON49
cq1YC4RdoE+H5vMSucrbMV2ePIrwNLv4GSIa9qIZmeF0Z+QyileZhVQZRnjLznGEJCjhBcZjHpjv
cIQrir0qpRhBng8kPQWKb8vjB14VoIMqTf74HixQI0le2AiwVgoTYzZ3BXQgGSsDXzE6kKJwFvuK
XFlQqECQSwXO3QdZBg08eeskaoZ9Ja4MTn4bMWTjHcFeiAZqiwYWga0nDXqzlNFGE2eUiQnyJZQT
OtZ0GCDbObrHc0p0xg4qIlVRtP1aKgtKSovpLg/luGGgcNzDFV5VfaiZ4jgGPCE8M86um/YiJfWq
QsnaR6KRgKVFJzSepaEIlHUNJoF10ExgwKqcnbNGWJyB+INazUjqRGrM5C1TTceCRYXEk0E5gbXQ
8tZ0eI2d0FlgxhJyLJYCMIYm2pbc3iUPV7a5mHtnpk2WIIkjnTNfZk3F3P4X4Z/mY/flQ8yk/hzV
z6vr4GvQnMmX87v7w+npVpp9EOcD0O+FIMN5wePXSJwdvWdx65/K1I9hX3lZANIeg7RnasOOWHoC
lmRxW4ZcPAiaL288FG/zpaOYTvUVGEi37xHEMgr41jtxXl8ggeVnIVmVzMkRSLusXTvJ2OMqMmvK
QzJ9M5cOTeQ2AyXgTt1RaQ7gUfh8tLZu214FlIKC8xOTvk5L216JmdLIFlNls1Ddnacq35dbR3OI
TsTLrQsmM68/uac+mxVQs0gVgo1OXoajqoYgcTctOciMHjsxxZTV+i0UB3DlkKnI6haxWmDVtFB2
DZxWhK6oGC9BDwG1tYD0dBHDuZNPoyLgePizJG8JUI7KkuGy6e4Oe7YDe2uXVGa4Y562mnCB9jSF
APcDkG46WIgx2b0Q5GYdNr5lxlNjjdCwQyBdEnnuqKsLyRTuyCqkzSE7MopkhoavEjMDApnCVoea
KUm8Eiw4P1ooZMoBkxo6Z+W0FEO+Cw5JDBfWhyxaA9p0idHWqq2ZeYnyKqRRFMEOiqB8UgG8KOJH
HLPg8SrHgG5/pJ0WdWgm39AKlX0AS78Y3QmFkBUbe7IdfibhuS1sUFBbEw+HxWW6jnGyy0pirdFy
D8IZM5m5yQWOIP1SoU6Rl9sstt5aD7QvCeELyly7xZoLbdd8fksNyUq8ioOAd4sobMqKvjpT06QS
AtIyvXAGccOwNtgLaTf8XckU4UJDsOJVxA==


--===============2412897171412366401==--