bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3870 to 3872)

[John David Duncan]

 3872 John David Duncan	2012-03-31 [merge]
      local merge

    modified:
      storage/ndb/memcache/extra/memcached/config_tests.in
 3871 John David Duncan	2012-03-31 [merge]
      local merge

    modified:
      storage/ndb/memcache/extra/memcached/CMakeLists.txt
 3870 Jan Wedvik	2012-03-30
      This commit is a refactoring. NdbQueryBuilderImpl::m_id, NdbQueryBuilderImpl::m_ix are
      renamed to m_opNo and m_internalOpNo. Associated methods are renamed in the same way.

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
=== modified file 'storage/ndb/memcache/extra/memcached/CMakeLists.txt'
--- a/storage/ndb/memcache/extra/memcached/CMakeLists.txt	2011-09-23 00:00:18 +0000
+++ b/storage/ndb/memcache/extra/memcached/CMakeLists.txt	2012-03-31 15:10:44 +0000
@@ -84,6 +84,7 @@ CHECK_INCLUDE_FILE("netdb.h"         HAV
 CHECK_INCLUDE_FILE("sys/uio.h"       HAVE_SYS_UIO_H)
 CHECK_INCLUDE_FILE("signal.h"        HAVE_SIGIGNORE)
 CHECK_INCLUDE_FILES("sys/types.h;netinet/tcp.h" HAVE_NETINET_TCP_H)
+CHECK_FUNCTION_EXISTS(htonll         HAVE_HTONLL)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_tests.in 
                ${CMAKE_CURRENT_SOURCE_DIR}/config.h)

=== modified file 'storage/ndb/memcache/extra/memcached/config_tests.in'
--- a/storage/ndb/memcache/extra/memcached/config_tests.in	2011-09-20 05:13:01 +0000
+++ b/storage/ndb/memcache/extra/memcached/config_tests.in	2012-03-31 15:16:18 +0000
@@ -24,6 +24,7 @@
 #cmakedefine HAVE_SYS_UIO_H
 #cmakedefine HAVE_NETINET_TCP_H
 #cmakedefine HAVE_SIGIGNORE
+#cmakedefine HAVE_HTONLL
 
 #include "my_config.h"
 #include "config_static.h"

No bundle (reason: useless for push emails).