bzr push into mysql-5.5-cluster branch (jonas.oreland:3624 to 3625)

[jonas oreland]

 3625 jonas oreland	2011-11-03
      ndb - new content in ndbinfo gives new line numbers

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade.result
 3624 jonas oreland	2011-11-03 [merge]
      ndb - merge 71 to 72

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SchemaChangeTest.java
      storage/ndb/include/kernel/statedesc.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp
    modified:
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/r/ndbinfo_dump.result
      mysql-test/suite/ndb/t/ndbinfo.test
      scripts/mysql_system_tables.sql
      sql/ha_ndbcluster_connection.cc
      storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Session.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Dictionary.java
      storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/vm/Rope.cpp
      storage/ndb/src/kernel/vm/Rope.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/src/HugoQueries.cpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-06-16 11:30:28 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-11-03 18:56:32 +0000
@@ -25,7 +25,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1568: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -55,7 +55,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1568: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -83,7 +83,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1568: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -111,7 +111,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1568: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -139,7 +139,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1568: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

No bundle (reason: useless for push emails).