From: Marc Alff
Date: November 15 2010 10:00am
Subject: bzr commit into mysql-trunk-wl4816 branch (marc.alff:3206)
List-Archive: http://lists.mysql.com/commits/123863
Message-Id: <201011151002.oAF3M5nE030338@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ based on revid:marc.alff@stripped

 3206 Marc Alff	2010-11-15 [merge]
      Merge cleanup

    modified:
      storage/perfschema/table_ews_by_thread_by_event_name.cc
=== modified file 'storage/perfschema/table_ews_by_thread_by_event_name.cc'
--- a/storage/perfschema/table_ews_by_thread_by_event_name.cc	2010-09-23 16:08:54 +0000
+++ b/storage/perfschema/table_ews_by_thread_by_event_name.cc	2010-11-15 09:58:20 +0000
@@ -74,7 +74,7 @@ table_ews_by_thread_by_event_name::m_fie
 PFS_engine_table_share
 table_ews_by_thread_by_event_name::m_share=
 {
-  { C_STRING_WITH_LEN("EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME") },
+  { C_STRING_WITH_LEN("events_waits_summary_by_thread_by_event_name") },
   &pfs_truncatable_acl,
   table_ews_by_thread_by_event_name::create,
   NULL, /* write_row */

No bundle (reason: revision is a merge).