bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3736)

[Magnus Blåudd]

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

 3736 Magnus Blåudd	2010-08-30
      ndb - revert hack for plug.in.disabled from CMakeLists.txt

    modified:
      CMakeLists.txt
      libmysqld/Makefile.am
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_connection.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-07-01 10:05:52 +0000
+++ b/CMakeLists.txt	2010-08-30 14:10:42 +0000
@@ -257,9 +257,6 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS})
           SET (WITH_${ENGINE}_STORAGE_ENGINE TRUE)
           SET (${ENGINE}_DIR ${DIRNAME})
         ENDIF (ENGINE_BUILD_TYPE STREQUAL "STATIC")
-      ELSEIF(EXISTS ${SUBDIR}/plug.in.disabled)
-          SET(WITH_${ENGINE}_STORAGE_ENGINE FALSE)
-          SET(ENGINE_BUILD_TYPE "NONE")
       ENDIF(EXISTS ${SUBDIR}/plug.in)
 
       IF(NOT ENGINE_BUILD_TYPE STREQUAL "NONE")

=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-02-12 14:48:30 +0000
+++ b/libmysqld/Makefile.am	2010-08-30 14:10:42 +0000
@@ -47,9 +47,7 @@ libmysqlsources =	errmsg.c get_password.
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
-	     ha_ndbcluster.cc ha_ndbcluster_cond.cc \
-	ha_ndbcluster_connection.cc ha_ndbinfo.cc \
-	ha_ndbcluster_binlog.cc ha_partition.cc \
+	     ha_ndbcluster.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
@@ -112,18 +110,6 @@ endif
 ha_ndbcluster.o:ha_ndbcluster.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
-ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-ha_ndbcluster_connection.o: ha_ndbcluster_connection.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-ha_ndbinfo.o: ha_ndbinfo.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
 # Until we can remove dependency on ha_ndbcluster.h
 handler.o:	handler.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2009-12-18 06:43:04 +0000
+++ b/sql/Makefile.am	2010-08-30 14:10:42 +0000
@@ -132,11 +132,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 nodist_mysqld_SOURCES =	mini_client_errors.c pack.c client.c my_time.c my_user.c 
 
 libndb_la_CPPFLAGS=	@ndbcluster_includes@
-libndb_la_SOURCES=	ha_ndbcluster.cc \
-			ha_ndbcluster_binlog.cc \
-			ha_ndbcluster_connection.cc \
-			ha_ndbcluster_cond.cc \
-			ha_ndbinfo.cc
+libndb_la_SOURCES=	ha_ndbcluster.cc
 
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-08-30 08:32:48 +0000
+++ b/sql/ha_ndbcluster.cc	2010-08-30 14:10:42 +0000
@@ -14500,4 +14500,9 @@ mysql_declare_plugin(ndbcluster)
 }
 mysql_declare_plugin_end;
 
+#include "ha_ndbcluster_binlog.cc"
+#include "ha_ndbcluster_cond.cc"
+#include "ha_ndbcluster_connection.cc"
+#include "ha_ndbinfo.cc"
+
 #endif

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-08-18 10:21:21 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-08-30 14:10:42 +0000
@@ -19,13 +19,10 @@
 #include "mysql_priv.h"
 #include "sql_show.h"
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-#include "ha_ndbcluster.h"
-#include "ha_ndbcluster_connection.h"
 
 #include "rpl_injector.h"
 #include "rpl_filter.h"
 #include "slave.h"
-#include "ha_ndbcluster_binlog.h"
 #include <ndbapi/NdbDictionary.hpp>
 #include <ndbapi/ndb_cluster_connection.hpp>
 #include <util/NdbAutoPtr.hpp>
@@ -48,7 +45,6 @@ extern ulong opt_server_id_mask;
 /*
   defines for cluster replication table names
 */
-#include "ha_ndbcluster_tables.h"
 #define NDB_APPLY_TABLE_FILE "./" NDB_REP_DB "/" NDB_APPLY_TABLE
 #define NDB_SCHEMA_TABLE_FILE "./" NDB_REP_DB "/" NDB_SCHEMA_TABLE
 static char repdb[]= NDB_REP_DB;

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2009-12-15 14:44:50 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2010-08-30 14:10:42 +0000
@@ -28,7 +28,6 @@
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #include <ndbapi/NdbApi.hpp>
-#include "ha_ndbcluster_cond.h"
 
 // Typedefs for long names 
 typedef NdbDictionary::Column NDBCOL;

=== modified file 'sql/ha_ndbcluster_connection.cc'
--- a/sql/ha_ndbcluster_connection.cc	2010-05-05 13:14:04 +0000
+++ b/sql/ha_ndbcluster_connection.cc	2010-08-30 14:10:42 +0000
@@ -25,7 +25,6 @@
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #include <ndbapi/NdbApi.hpp>
 #include <portlib/NdbTick.h>
-#include "ha_ndbcluster_connection.h"
 
 Ndb* g_ndb= NULL;
 Ndb_cluster_connection* g_ndb_cluster_connection= NULL;

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