From: Alexander Nozdrin Date: June 9 2011 9:43am Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3173) Bug#11763162 List-Archive: http://lists.mysql.com/commits/138934 X-Bug: 11763162 Message-Id: <201106090944.p599i2YO003037@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6805837526191475933==" --===============6805837526191475933== 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 3173 Alexander Nozdrin 2011-06-09 Pre-requisite patch for Bug#11763162 (55843 - Handled condition appears as not handled). Get rid of THD::set_warning_info() as a shortcut to Diagnostics_area::set_warning_info(). modified: sql/sp_head.cc sql/sql_admin.cc sql/sql_class.h sql/sql_show.cc === modified file 'sql/sp_head.cc' --- a/sql/sp_head.cc 2011-06-09 08:58:41 +0000 +++ b/sql/sp_head.cc 2011-06-09 09:43:53 +0000 @@ -1214,6 +1214,7 @@ sp_head::execute(THD *thd, bool merge_da String old_packet; Reprepare_observer *save_reprepare_observer= thd->m_reprepare_observer; Object_creation_ctx *saved_creation_ctx; + Diagnostics_area *da= thd->get_stmt_da(); Warning_info *saved_warning_info; Warning_info warning_info(thd->get_warning_info()->warn_id(), false); @@ -1288,7 +1289,7 @@ sp_head::execute(THD *thd, bool merge_da /* Push a new warning information area. */ warning_info.append_warning_info(thd, thd->get_warning_info()); saved_warning_info= thd->get_warning_info(); - thd->set_warning_info(&warning_info); + da->set_warning_info(&warning_info); /* Switch query context. This has to be done early as this is sometimes @@ -1497,7 +1498,7 @@ sp_head::execute(THD *thd, bool merge_da */ if (err_status || merge_da_on_success) saved_warning_info->merge_with_routine_info(thd, thd->get_warning_info()); - thd->set_warning_info(saved_warning_info); + da->set_warning_info(saved_warning_info); done: DBUG_PRINT("info", ("err_status: %d killed: %d is_slave_error: %d report_error: %d", === modified file 'sql/sql_admin.cc' --- a/sql/sql_admin.cc 2011-06-09 08:58:41 +0000 +++ b/sql/sql_admin.cc 2011-06-09 09:43:53 +0000 @@ -351,17 +351,18 @@ static bool mysql_admin_table(THD* thd, because it's already known that the table is badly damaged. */ + Diagnostics_area *da= thd->get_stmt_da(); Warning_info wi(thd->query_id, false); Warning_info *wi_saved= thd->get_warning_info(); - thd->set_warning_info(&wi); + da->set_warning_info(&wi); open_error= open_temporary_tables(thd, table); if (!open_error) open_error= open_and_lock_tables(thd, table, TRUE, 0); - thd->set_warning_info(wi_saved); + da->set_warning_info(wi_saved); } else { === modified file 'sql/sql_class.h' --- a/sql/sql_class.h 2011-06-09 09:36:20 +0000 +++ b/sql/sql_class.h 2011-06-09 09:43:53 +0000 @@ -2840,10 +2840,6 @@ public: const Warning_info *get_warning_info() const { return const_cast (this)->get_warning_info(); } - /// Sets Warning-information-area for the current statement. - void set_warning_info(Warning_info *wi) - { get_stmt_da()->set_warning_info(wi); } - /// Returns Diagnostics-area for the current statement. Diagnostics_area *get_stmt_da() { return m_stmt_da; } === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2011-06-09 08:58:41 +0000 +++ b/sql/sql_show.cc 2011-06-09 09:43:53 +0000 @@ -6803,15 +6803,16 @@ static bool do_fill_table(THD *thd, // Warning_info, so "useful warnings" get rejected. In order to avoid // 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(); - thd->set_warning_info(&wi); + da->set_warning_info(&wi); bool res= table_list->schema_table->fill_table( thd, table_list, join_table->condition()); - thd->set_warning_info(wi_saved); + da->set_warning_info(wi_saved); // Pass an error if any. --===============6805837526191475933== 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\ # 8vm2z8c0qnhli9y2 # target_branch: file:///home/alik/MySQL/bzr/00/bug55843/mysql-trunk-\ # bug55843-03/ # testament_sha1: da8165329121c962cc1add2913624c042e898218 # timestamp: 2011-06-09 13:43:58 +0400 # base_revision_id: alexander.nozdrin@stripped\ # 28ln6jstgmgy4v9b # # Begin bundle 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 --===============6805837526191475933==--