bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3993)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.1/ based on revid:magnus.blaudd@stripped

 3993 Magnus Blåudd	2010-11-26
      ndb - remove type_ndbapi.cmake from  a few more files using it

    modified:
      storage/ndb/src/ndbjtie/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt
      storage/ndb/src/ndbjtie/mysql/CMakeLists.txt
      storage/ndb/src/ndbjtie/test/CMakeLists.txt
=== modified file 'storage/ndb/src/ndbjtie/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/CMakeLists.txt	2010-03-01 19:24:42 +0000
+++ b/storage/ndb/src/ndbjtie/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -13,8 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 ADD_SUBDIRECTORY(jtie)
 ADD_SUBDIRECTORY(mysql)
 ADD_SUBDIRECTORY(test)

=== modified file 'storage/ndb/src/ndbjtie/jtie/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt	2010-03-01 19:24:42 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -14,8 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 ADD_SUBDIRECTORY(test)
 
 SET ( JAVA_SOURCE_DIRS

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt	2010-03-01 19:25:42 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -14,8 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 ADD_SUBDIRECTORY(myjapi)
 ADD_SUBDIRECTORY(unload)
 

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt	2010-03-01 19:25:42 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -14,8 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 CREATE_JAR(jtie-test-myjapi 
   ${CMAKE_CURRENT_SOURCE_DIR}/myjapi/*.java 
   ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt	2010-03-01 19:25:42 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -14,8 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 CREATE_JAR(jtie-test-unload
   ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java
   CLASSPATH ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes

=== modified file 'storage/ndb/src/ndbjtie/mysql/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/mysql/CMakeLists.txt	2010-02-24 09:55:08 +0000
+++ b/storage/ndb/src/ndbjtie/mysql/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -13,8 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
 		${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/utils 
 		${CMAKE_SOURCE_DIR}/storage/ndb/include 

=== modified file 'storage/ndb/src/ndbjtie/test/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/test/CMakeLists.txt	2010-03-01 19:25:42 +0000
+++ b/storage/ndb/src/ndbjtie/test/CMakeLists.txt	2010-11-26 09:56:29 +0000
@@ -13,8 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
 SET ( JAVA_SOURCE_DIRS
  ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java)
 

Attachment: [text/bzr-bundle] bzr/[e-mail]