List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 18 2010 5:58am
Subject:bzr push into mysql-next-mr-bugfixing branch (marc.alff:3177)
View as plain text  
 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;


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100518055804-qzvqtqfpkjyylp3i.bundle
Thread
bzr push into mysql-next-mr-bugfixing branch (marc.alff:3177) Marc Alff18 May