List:Commits« Previous MessageNext Message »
From:Marc Alff Date:November 9 2010 10:36am
Subject:bzr commit into mysql-next-mr branch (marc.alff:3374)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-merge/ based on revid:ramil@stripped

 3374 Marc Alff	2010-11-09
      Fixed broken merge

    modified:
      storage/perfschema/table_threads.cc
=== modified file 'storage/perfschema/table_threads.cc'
--- a/storage/perfschema/table_threads.cc	2010-10-07 21:16:41 +0000
+++ b/storage/perfschema/table_threads.cc	2010-11-09 10:36:41 +0000
@@ -103,7 +103,7 @@ table_threads::m_field_def=
 PFS_engine_table_share
 table_threads::m_share=
 {
-  { C_STRING_WITH_LEN("THREADS") },
+  { C_STRING_WITH_LEN("threads") },
   &pfs_updatable_acl,
   &table_threads::create,
   NULL, /* write_row */


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20101109103641-vtz901ku42h978ko.bundle
Thread
bzr commit into mysql-next-mr branch (marc.alff:3374) Marc Alff9 Nov