bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3893 to 3894)

[Magnus Blåudd]

 3894 Magnus Blåudd	2010-10-25
      ndb
       - revert change of relative dir to fix path for sql/ha_ndbcluster sine it'll break
        embedded server compile.

    modified:
      storage/ndb/CMakeLists.txt
 3893 Magnus Blåudd	2010-10-25 [merge]
      Merge

    added:
      sql/ha_ndbcluster_glue.h
    modified:
      include/my_base.h
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/handler.h
      sql/mysql_priv.h
      sql/set_var.cc
      sql/sql_base.cc
      sql/sql_delete.cc
      sql/sql_update.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/src/kernel/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-10-22 12:55:44 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-10-25 12:27:41 +0000
@@ -78,11 +78,11 @@ IF(WITHOUT_PARTITION_STORAGE_ENGINE)
 ENDIF(WITHOUT_PARTITION_STORAGE_ENGINE)
 
 SET(NDBCLUSTER_SOURCES
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_cond.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_connection.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_binlog.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbinfo.cc)
+  ../../sql/ha_ndbcluster.cc
+  ../../sql/ha_ndbcluster_cond.cc
+  ../../sql/ha_ndbcluster_connection.cc
+  ../../sql/ha_ndbcluster_binlog.cc
+  ../../sql/ha_ndbinfo.cc)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include)
 
 

No bundle (reason: useless for push emails).