bzr push into mysql-5.5-cluster-7.3-fk branch (magnus.blaudd:3901 to 3902)

[magnus.blaudd]

 3902 magnus.blaudd@stripped	2012-07-13
      ndb test
       - don't run ndb_fk_cascade_delete_multi on Windows until we
        have removed the use of create and drop_fk tools completely

    modified:
      mysql-test/suite/ndb/t/ndb_fk_cascade_delete_multi.test
 3901 magnus.blaudd@stripped	2012-07-13 [merge]
      Merge 7.3-fk -> 7.3

    added:
      mysql-test/suite/ndb/r/ndb_fk_alter.result
      mysql-test/suite/ndb/r/ndb_fk_bugs.result
      mysql-test/suite/ndb/r/ndb_fk_build.result
      mysql-test/suite/ndb/r/ndb_fk_cascade_delete.result
      mysql-test/suite/ndb/r/ndb_fk_cascade_delete_multi.result
      mysql-test/suite/ndb/r/ndb_fk_cascade_update.result
      mysql-test/suite/ndb/r/ndb_fk_create_drop.result
      mysql-test/suite/ndb/r/ndb_fk_locking.result
      mysql-test/suite/ndb/r/ndb_fk_multi_column.result
      mysql-test/suite/ndb/r/ndb_fk_noaction.result
      mysql-test/suite/ndb/r/ndb_fk_restrict.result
      mysql-test/suite/ndb/r/ndb_fk_setnull.result
      mysql-test/suite/ndb/t/find_ndb_fk_tools.inc
      mysql-test/suite/ndb/t/ndb_fk_alter.test
      mysql-test/suite/ndb/t/ndb_fk_bugs.test
      mysql-test/suite/ndb/t/ndb_fk_build.test
      mysql-test/suite/ndb/t/ndb_fk_cascade_delete.test
      mysql-test/suite/ndb/t/ndb_fk_cascade_delete_multi.test
      mysql-test/suite/ndb/t/ndb_fk_cascade_update.test
      mysql-test/suite/ndb/t/ndb_fk_create_drop.test
      mysql-test/suite/ndb/t/ndb_fk_locking.test
      mysql-test/suite/ndb/t/ndb_fk_multi_column.test
      mysql-test/suite/ndb/t/ndb_fk_noaction.test
      mysql-test/suite/ndb/t/ndb_fk_restrict.test
      mysql-test/suite/ndb/t/ndb_fk_setnull.test
      sql/ha_ndb_ddl_fk.cc
      storage/ndb/include/kernel/signaldata/BuildFK.hpp
      storage/ndb/include/kernel/signaldata/BuildFKImpl.hpp
      storage/ndb/include/kernel/signaldata/CreateFK.hpp
      storage/ndb/include/kernel/signaldata/CreateFKImpl.hpp
      storage/ndb/include/kernel/signaldata/DropFK.hpp
      storage/ndb/include/kernel/signaldata/DropFKImpl.hpp
      storage/ndb/test/tools/create_fk.cpp
      storage/ndb/test/tools/drop_fk.cpp
    modified:
      .bzr-mysql/default.conf
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/sql_class.h
      sql/sql_partition.cc
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/Interpreter.hpp
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
      storage/ndb/include/kernel/signaldata/ListTables.hpp
      storage/ndb/include/kernel/signaldata/LqhKey.hpp
      storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
      storage/ndb/include/kernel/trigger_definitions.h
      storage/ndb/include/ndb_constants.h
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.hpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/tools/CMakeLists.txt
      storage/ndb/tools/listTables.cpp
=== modified file 'mysql-test/suite/ndb/t/ndb_fk_cascade_delete_multi.test'
--- a/mysql-test/suite/ndb/t/ndb_fk_cascade_delete_multi.test	2012-07-13 11:05:01 +0000
+++ b/mysql-test/suite/ndb/t/ndb_fk_cascade_delete_multi.test	2012-07-13 13:46:09 +0000
@@ -1,3 +1,6 @@
+# Does not work on Windows until we got rid of create_fk and drop_fk
+-- source include/not_windows.inc
+
 -- source include/have_ndb.inc
 -- source find_ndb_fk_tools.inc
 

No bundle (reason: useless for push emails).