bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3356)

[Jonas Oreland]

#At file:///home/jonas/src/70-spj-svs/ based on revid:ole.john.aske@stripped

 3356 Jonas Oreland	2010-11-10 [merge]
      ndb - merge 709 into 70-spj-svs

    removed:
      storage/ndb/cmake/cmake_parse_arguments.cmake
      storage/ndb/cmake/libutils.cmake
      storage/ndb/include/portlib/PortDefs.h
    added:
      cmake/
      cmake/Makefile.am
      cmake/abi_check.cmake
      cmake/bison.cmake
      cmake/build_configurations/
      cmake/build_configurations/mysql_release.cmake
      cmake/cat.cmake
      cmake/character_sets.cmake
      cmake/check_minimal_version.cmake
      cmake/cmake_parse_arguments.cmake
      cmake/configurable_file_content.in
      cmake/configure.pl
      cmake/cpack_source_ignore_files.cmake
      cmake/create_initial_db.cmake.in
      cmake/do_abi_check.cmake
      cmake/dtrace.cmake
      cmake/dtrace_prelink.cmake
      cmake/install_layout.cmake
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/make_dist.cmake.in
      cmake/merge_archives_unix.cmake.in
      cmake/mysql_add_executable.cmake
      cmake/mysql_version.cmake
      cmake/os/
      cmake/os/AIX.cmake
      cmake/os/Cygwin.cmake
      cmake/os/Darwin.cmake
      cmake/os/FreeBSD.cmake
      cmake/os/HP-UX.cmake
      cmake/os/Linux.cmake
      cmake/os/OS400.cmake
      cmake/os/SunOS.cmake
      cmake/os/Windows.cmake
      cmake/os/WindowsCache.cmake
      cmake/package_name.cmake
      cmake/plugin.cmake
      cmake/readline.cmake
      cmake/ssl.cmake
      cmake/stack_direction.c
      cmake/tags.cmake
      cmake/versioninfo.rc.in
      cmake/zlib.cmake
      mysql-test/suite/ndb_binlog/r/ndb_binlog_log_apply_status.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_log_apply_status.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_break_3_chain.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test
      storage/ndb/include/ndb_config.h.in
      storage/ndb/ndb_configure.cmake
      storage/ndb/src/ndbapi/trp_buffer.cpp
      storage/ndb/src/ndbapi/trp_buffer.hpp
    renamed:
      storage/ndb/include/portlib/prefetch.h => storage/ndb/include/portlib/ndb_prefetch.h
    modified:
      Makefile.am
      client/client_priv.h
      configure.in
      include/mysql.h.pp
      include/mysql_com.h
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_ndbcluster_connection.cc
      sql/ha_ndbcluster_glue.h
      sql/ha_partition.cc
      sql/item.h
      sql/rpl_utility.cc
      sql/table.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/Makefile.am
      storage/ndb/config/type_ndbapitest.cmake
      storage/ndb/include/Makefile.am
      storage/ndb/include/ndb_global.h
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
      storage/ndb/include/portlib/ndb_socket_win32.h
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/ndb_configure.m4
      storage/ndb/src/CMakeLists.txt
      storage/ndb/src/common/portlib/CMakeLists.txt
      storage/ndb/src/common/portlib/NdbNuma.cpp
      storage/ndb/src/common/transporter/Packer.cpp
      storage/ndb/src/common/transporter/Packer.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/kernel/CMakeLists.txt
      storage/ndb/src/kernel/blocks/CMakeLists.txt
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/FastScheduler.cpp
      storage/ndb/src/kernel/vm/FastScheduler.hpp
      storage/ndb/src/kernel/vm/mt-asm.h
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmclient/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/ndbapi/CMakeLists.txt
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/Ndb.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbImpl.hpp
      storage/ndb/src/ndbapi/NdbOperationExec.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/SignalSender.hpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
      storage/ndb/src/ndbapi/trp_client.hpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testPartitioning.cpp
      storage/ndb/test/src/NdbBackup.cpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/restore/Restore.cpp
      storage/ndb/tools/restore/Restore.hpp
      storage/ndb/tools/restore/consumer_restore.cpp
      storage/ndb/tools/restore/restore_main.cpp
      storage/ndb/include/portlib/ndb_prefetch.h

Diff too large for email (10152 lines, the limit is 10000).
No bundle (reason: revision is a merge).