From: Marc Alff
Date: May 18 2010 5:58am
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3177)
List-Archive: http://lists.mysql.com/commits/108470
Message-Id: <201005180600.o4I5DXSR002281@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1766186966195892599=="

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

 3177 Marc Alff	2010-05-17 [merge]
      local merge

    added:
      mysql-test/suite/funcs_1/r/row_count_func.result
      mysql-test/suite/funcs_1/t/row_count_func-master.opt
      mysql-test/suite/funcs_1/t/row_count_func.test
    modified:
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/mysqld--help.inc
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/sp.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
      mysql-test/t/parser_stack.test
      sql/ha_ndbcluster_binlog.cc
      sql/item_func.cc
      sql/log_event.cc
      sql/protocol.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_signal.cc
      sql/sql_update.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_global.cc
      storage/perfschema/pfs_global.h
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-05-11 14:19:09 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-05-18 05:58:04 +0000
@@ -145,6 +145,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;


--===============1766186966195892599==
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-next-mr-bugfixing-\
#   53617/
# testament_sha1: 83039109e4a2a5c30eae0d471a27a49b9f3e4b42
# timestamp: 2010-05-17 23:58:52 -0600
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--===============1766186966195892599==--