bzr commit into mysql-trunk branch (alexander.nozdrin:3168) Bug#11763162

[Alexander Nozdrin]

#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++;


Attachment: [text/bzr-bundle] bzr/[e-mail]