From: Alexander Nozdrin Date: June 7 2011 4:14pm Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3168) Bug#11763162 List-Archive: http://lists.mysql.com/commits/138800 X-Bug: 11763162 Message-Id: <201106071614.p57GESXF007981@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0604528543013063650==" --===============0604528543013063650== 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-01/ based on revid:alexander.nozdrin@stripped 3168 Alexander Nozdrin 2011-06-07 Pre-requisite patch for Bug#11763162 (55843 - Handled condition appears as not handled). Rename Diagnostics_area::statement_warn_count() to da_statement_warn_count() in order to distinguish from Warning_info::statement_warn_count(). modified: sql/protocol.cc sql/sql_error.cc sql/sql_error.h storage/perfschema/pfs.cc === modified file 'sql/protocol.cc' --- a/sql/protocol.cc 2011-06-07 13:09:47 +0000 +++ b/sql/protocol.cc 2011-06-07 16:14:06 +0000 @@ -503,11 +503,11 @@ void Protocol::end_statement() break; case Diagnostics_area::DA_EOF: error= send_eof(thd->server_status, - thd->get_stmt_da()->statement_warn_count()); + thd->get_stmt_da()->da_statement_warn_count()); break; case Diagnostics_area::DA_OK: error= send_ok(thd->server_status, - thd->get_stmt_da()->statement_warn_count(), + thd->get_stmt_da()->da_statement_warn_count(), thd->get_stmt_da()->affected_rows(), thd->get_stmt_da()->last_insert_id(), thd->get_stmt_da()->message()); === modified file 'sql/sql_error.cc' --- a/sql/sql_error.cc 2011-06-07 13:29:37 +0000 +++ b/sql/sql_error.cc 2011-06-07 16:14:06 +0000 @@ -344,7 +344,7 @@ Diagnostics_area::reset_diagnostics_area m_sql_errno= 0; m_affected_rows= 0; m_last_insert_id= 0; - m_statement_warn_count= 0; + m_da_statement_warn_count= 0; #endif is_sent= FALSE; /** Tiny reset in debug mode to see garbage right away */ @@ -372,7 +372,7 @@ Diagnostics_area::set_ok_status(THD *thd if (is_error() || is_disabled()) return; - m_statement_warn_count= thd->get_warning_info()->statement_warn_count(); + m_da_statement_warn_count= thd->get_warning_info()->statement_warn_count(); m_affected_rows= affected_rows_arg; m_last_insert_id= last_insert_id_arg; if (message_arg) @@ -406,7 +406,7 @@ Diagnostics_area::set_eof_status(THD *th number of warnings, since they are not available to the client anyway. */ - m_statement_warn_count= (thd->spcont ? + m_da_statement_warn_count= (thd->spcont ? 0 : thd->get_warning_info()->statement_warn_count()); m_status= DA_EOF; === modified file 'sql/sql_error.h' --- a/sql/sql_error.h 2011-06-07 13:29:37 +0000 +++ b/sql/sql_error.h 2011-06-07 16:14:06 +0000 @@ -479,10 +479,10 @@ public: ulonglong last_insert_id() const { DBUG_ASSERT(m_status == DA_OK); return m_last_insert_id; } - uint statement_warn_count() const + uint da_statement_warn_count() const { DBUG_ASSERT(m_status == DA_OK || m_status == DA_EOF); - return m_statement_warn_count; + return m_da_statement_warn_count; } public: @@ -533,7 +533,7 @@ private: the statement doesn't clear the warnings, and doesn't generate them. */ - uint m_statement_warn_count; + uint m_da_statement_warn_count; enum_diagnostics_status m_status; Warning_info m_main_wi; === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2011-05-13 13:44:31 +0000 +++ b/storage/perfschema/pfs.cc 2011-06-07 16:14:06 +0000 @@ -4110,11 +4110,11 @@ static void end_statement_v1(PSI_stateme memcpy(pfs->m_message_text, da->message(), MYSQL_ERRMSG_SIZE); pfs->m_message_text[MYSQL_ERRMSG_SIZE]= 0; pfs->m_rows_affected= da->affected_rows(); - pfs->m_warning_count= da->statement_warn_count(); + pfs->m_warning_count= da->da_statement_warn_count(); memcpy(pfs->m_sqlstate, "00000", SQLSTATE_LENGTH); break; case Diagnostics_area::DA_EOF: - pfs->m_warning_count= da->statement_warn_count(); + pfs->m_warning_count= da->da_statement_warn_count(); break; case Diagnostics_area::DA_ERROR: memcpy(pfs->m_message_text, da->message(), MYSQL_ERRMSG_SIZE); @@ -4177,10 +4177,10 @@ static void end_statement_v1(PSI_stateme break; case Diagnostics_area::DA_OK: stat->m_rows_affected+= da->affected_rows(); - stat->m_warning_count+= da->statement_warn_count(); + stat->m_warning_count+= da->da_statement_warn_count(); break; case Diagnostics_area::DA_EOF: - stat->m_warning_count+= da->statement_warn_count(); + stat->m_warning_count+= da->da_statement_warn_count(); break; case Diagnostics_area::DA_ERROR: stat->m_error_count++; --===============0604528543013063650== 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\ # u8m8vpv5fvdd1801 # target_branch: file:///home/alik/MySQL/bzr/00/bug55843/mysql-trunk-\ # bug55843-01/ # testament_sha1: 47e152fd21c77413de75834853d00ae632984526 # timestamp: 2011-06-07 20:14:11 +0400 # base_revision_id: alexander.nozdrin@stripped\ # 9snfx2nh1c9j59bl # # Begin bundle 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 --===============0604528543013063650==--