From: Marc Alff
Date: May 18 2010 6:52am
Subject: bzr commit into mysql-6.0-codebase-bugfixing branch (marc.alff:3882)
List-Archive: http://lists.mysql.com/commits/108472
Message-Id: <201005180652.o4I6fDZp018911@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2921548417679527331=="

--===============2921548417679527331==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-6.0-codebase-bugfixing/ based on revid:alik@stripped

 3882 Marc Alff	2010-05-18 [merge]
      Merge mysql-next-mr-bugfixing --> mysql-6.0-codebase-bugfixing

    modified:
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-05-13 12:33:29 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-05-18 06:51:57 +0000
@@ -147,6 +147,9 @@ void PFS_engine_table_share::check_one_t
       m_checked= true;
     close_thread_tables(thd);
   }
+  else
+    sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE),
+                    PERFORMANCE_SCHEMA_str.str, m_name.str);
 
   lex_end(&dummy_lex);
   thd->lex= old_lex;


--===============2921548417679527331==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\
#   bugfixing/
# testament_sha1: c3e6f863dfe41f68a081dd0751279ffabfd2f8d4
# timestamp: 2010-05-18 00:52:18 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--===============2921548417679527331==--