List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:June 29 2011 12:12pm
Subject:bzr push into mysql-5.5-cluster branch (jonas.oreland:3390 to 3391)
View as plain text  
 3391 Jonas Oreland	2011-06-29
      ndb - remove more automake files

    removed:
      storage/ndb/Makefile.am
      storage/ndb/clusterj/Makefile.am
      storage/ndb/clusterj/clusterj-api/Makefile.am
      storage/ndb/clusterj/clusterj-core/Makefile.am
      storage/ndb/clusterj/clusterj-jdbc/Makefile.am
      storage/ndb/clusterj/clusterj-jpatest/Makefile.am
      storage/ndb/clusterj/clusterj-openjpa/Makefile.am
      storage/ndb/clusterj/clusterj-test/Makefile.am
      storage/ndb/clusterj/clusterj-tie/Makefile.am
      storage/ndb/docs/Makefile.am
      storage/ndb/include/Makefile.am
      storage/ndb/src/Makefile.am
      storage/ndb/src/common/Makefile.am
      storage/ndb/src/common/debugger/Makefile.am
      storage/ndb/src/common/debugger/signaldata/Makefile.am
      storage/ndb/src/common/logger/Makefile.am
      storage/ndb/src/common/mgmcommon/Makefile.am
      storage/ndb/src/common/portlib/Makefile.am
      storage/ndb/src/common/transporter/Makefile.am
      storage/ndb/src/common/util/Makefile.am
      storage/ndb/src/cw/Makefile.am
      storage/ndb/src/cw/cpcd/Makefile.am
      storage/ndb/src/kernel/Makefile.am
      storage/ndb/src/kernel/blocks/Makefile.am
      storage/ndb/src/kernel/blocks/backup/Makefile.am
      storage/ndb/src/kernel/blocks/dbdict/Makefile.am
      storage/ndb/src/kernel/blocks/dbdih/Makefile.am
      storage/ndb/src/kernel/blocks/dblqh/Makefile.am
      storage/ndb/src/kernel/blocks/dbtup/Makefile.am
      storage/ndb/src/kernel/error/Makefile.am
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/mgmapi/Makefile.am
      storage/ndb/src/mgmclient/Makefile.am
      storage/ndb/src/mgmsrv/Makefile.am
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbjtie/Makefile.am
      storage/ndb/src/ndbjtie/jtie/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/unload/Makefile.am
      storage/ndb/src/ndbjtie/mysql/Makefile.am
      storage/ndb/src/ndbjtie/mysql/test/Makefile.am
      storage/ndb/src/ndbjtie/test/Makefile.am
      storage/ndb/test/Makefile.am
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/ndbapi/bank/Makefile.am
      storage/ndb/test/run-test/Makefile.am
      storage/ndb/test/src/Makefile.am
      storage/ndb/test/tools/Makefile.am
      storage/ndb/tools/Makefile.am
 3390 Martin Skold	2011-06-29
      Reverted add/drop index behavior in the backward compatible layer to minimize difference to mainline

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      sql/handler.cc
      sql/sql_table.cc
=== removed file 'storage/ndb/Makefile.am'
--- a/storage/ndb/Makefile.am	2011-06-15 14:21:47 +0000
+++ b/storage/ndb/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = include src tools . @ndb_opt_subdirs@
-DIST_SUBDIRS = src tools include test docs clusterj
-EXTRA_DIST = config cmake ndbapi-examples plug.in CMakeLists.txt ndb_configure.cmake
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-dist-hook:
-	-rm -rf `find $(distdir) -type d -name SCCS`
-	-rm -rf `find $(distdir)/ndbapi-examples -name '*.o'`
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" != "." -a "$$subdir" != "include"; then \
-	    files="`find $$subdir -name '*\.h'` `find $$subdir -name '*\.hpp'`"; \
-	    for f in $$files; do \
-	      if test -d "$(distdir)/`dirname $$f`" -a ! -e "$(distdir)/$$f"; then \
-	        cp $$f $(distdir)/$$f; \
-	      fi; \
-	    done; \
-	  fi; \
-	done
-

=== removed file 'storage/ndb/clusterj/Makefile.am'
--- a/storage/ndb/clusterj/Makefile.am	2011-05-19 21:18:12 +0000
+++ b/storage/ndb/clusterj/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#   Copyright 2010 Sun Microsystems, Inc.
-#   All rights reserved. Use is subject to license terms.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-CLUSTERJ_EXPORT=com.mysql.clusterj,com.mysql.clusterj.annotation,com.mysql.clusterj.query,com.mysql.clusterj.core,com.mysql.clusterj.core.metadata,com.mysql.clusterj.core.query,com.mysql.clusterj.core.spi,com.mysql.clusterj.core.store,com.mysql.clusterj.core.util,com.mysql.clusterj.jdbc,com.mysql.clusterj.jdbc.antlr,com.mysql.clusterj.jdbc.antlr.node,com.mysql.clusterj.tie
-
-BASE_DIRS = clusterj-api clusterj-core clusterj-tie
-
-SUBDIRS = $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_JDBC_OPT)
-
-DIST_SUBDIRS = clusterj-api clusterj-core clusterj-tie clusterj-jpatest clusterj-openjpa clusterj-test clusterj-jdbc
-
-NDBJTIE_DIRS = $(top_srcdir)/storage/ndb/src/ndbjtie $(top_srcdir)/storage/ndb/src/ndbjtie/jtie
-
-CLUSTERJ_MANIFEST = CLUSTERJ_MANIFEST.MF
-
-clusterjdir= $(prefix)/share/mysql/java/
-
-clusterj_version_jar = clusterj-$(JAVA_NDB_VERSION).jar
-clusterj_jar = clusterj.jar
-
-clusterj_DATA = $(clusterj_version_jar)
-
-EXTRA_DIST = pom.xml CMakeLists.txt
-
-class_timestamps = clusterj-api/classclusterj_api.stamp \
-                   clusterj-core/classclusterj_core.stamp \
-                   clusterj-tie/classclusterj_tie.stamp
-
-$(CLUSTERJ_MANIFEST):
-	echo "Manifest-Version: 1.0"  > $(CLUSTERJ_MANIFEST)
-	echo "Export-Package: $(CLUSTERJ_EXPORT)"  >> $(CLUSTERJ_MANIFEST) 
-	echo "Bundle-Name: ClusterJ"  >> $(CLUSTERJ_MANIFEST)
-	echo "Bundle-Description: ClusterJ"  >> $(CLUSTERJ_MANIFEST)
-
-# make both clusterj and clusterjpa jar (the latter optional based on OPENJPA_OPT)
-$(clusterj_version_jar) : $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_MANIFEST) $(class_timestamps)
-	rm -f $(clusterj_version_jar); \
-	@JAR@ cvfm $(clusterj_version_jar) $(CLUSTERJ_MANIFEST); \
-	for i in $(BASE_DIRS); do \
-	  BASE_NAME=`echo $$i | sed 's/clusterj-//'`; \
-	  @JAR@ uvf $@ -C $$i/target/classes com/mysql/clusterj; \
-	  if test -x $$i/src/main/resources/META-INF/services; then \
-	    @JAR@ uvf $@ -C $$i/src/main/resources META-INF/services; \
-	  fi; \
-	 BUNDLE=$$i/src/main/resources/com/mysql/clusterj/$$BASE_NAME/Bundle.properties; \
-	  if test -e $$BUNDLE; then \
-	    @JAR@ uvf $@ -C $$i/src/main/resources com/mysql/clusterj/$$BASE_NAME/Bundle.properties; \
-	  fi; \
-	done; \
-	@JAR@ uvf $@ -C ../src/ndbjtie/target/classes com/mysql/ndbjtie; \
-	@JAR@ uvf $@ -C ../src/ndbjtie/jtie/target/classes com/mysql/jtie; \
-	echo $$CLASS_DIRS
-
-install-data-hook:
-	cd $(DESTDIR)/$(clusterjdir) && \
-	$(LN_CP_F) -f $(clusterj_version_jar) $(clusterj_jar) 
-
-CLEANFILES= $(clusterj_version_jar) $(clusterj_jar) $(clusterjpa_version_jar) $(clusterjpa_jar)
-
-MOSTLYCLEANFILES = $(CLUSTERJPA_MANIFEST) $(CLUSTERJ_MANIFEST)

=== removed file 'storage/ndb/clusterj/clusterj-api/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-api/Makefile.am	2011-03-23 22:59:52 +0000
+++ b/storage/ndb/clusterj/clusterj-api/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-#   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-#include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_api_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-api/src/main/java
-
-clusterj_api_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-api/src/main/resources
-
-MANIFEST = MANIFEST.MF
-
-JAVAROOT=$(top_srcdir)/storage/ndb/clusterj/clusterj-api/target/classes
-
-CLASSPATH_ENV = CLASSPATH=$(JAVAROOT)
-
-clusterj_apidir= $(prefix)/share/mysql/java/
-
-clusterj_api_version_JAR = clusterj-api-@JAVA_NDB_VERSION@.jar
-clusterj_api_JAR = clusterj-api.jar
-
-clusterj_api_java = \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Column.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Columns.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Extension.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Extensions.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Index.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Indices.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Lob.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/NotPersistent.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/NullValue.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/PartitionKey.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/PersistenceCapable.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/PersistenceModifier.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/Persistent.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/PrimaryKey.java \
-  $(clusterj_api_src)/com/mysql/clusterj/Results.java \
-  $(clusterj_api_src)/com/mysql/clusterj/Query.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/Predicate.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/PredicateOperand.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/QueryDefinition.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/QueryDomainType.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/QueryBuilder.java \
-  $(clusterj_api_src)/com/mysql/clusterj/Transaction.java \
-  $(clusterj_api_src)/com/mysql/clusterj/Session.java \
-  $(clusterj_api_src)/com/mysql/clusterj/SessionFactory.java \
-  $(clusterj_api_src)/com/mysql/clusterj/SessionFactoryService.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJDatastoreException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJFatalException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJFatalInternalException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJFatalUserException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJHelper.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ClusterJUserException.java \
-  $(clusterj_api_src)/com/mysql/clusterj/Constants.java \
-  $(clusterj_api_src)/com/mysql/clusterj/LockMode.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ColumnMetadata.java \
-  $(clusterj_api_src)/com/mysql/clusterj/ColumnType.java \
-  $(clusterj_api_src)/com/mysql/clusterj/DynamicObject.java \
-  $(clusterj_api_src)/com/mysql/clusterj/DynamicObjectDelegate.java
-
-
-clusterj_api_DATA = $(clusterj_api_version_JAR)
-
-EXTRA_DIST = \
-  $(clusterj_api_src)/com/mysql/clusterj/*.java \
-  $(clusterj_api_src)/com/mysql/clusterj/package.html \
-  $(clusterj_api_src)/com/mysql/clusterj/query/*.java \
-  $(clusterj_api_src)/com/mysql/clusterj/query/package.html \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/*.java \
-  $(clusterj_api_src)/com/mysql/clusterj/annotation/package.html \
-  pom.xml CMakeLists.txt
-
-$(MANIFEST): 
-	echo "Manifest-Version: 1.0"  > $(MANIFEST) 
-	echo "Export-Package: com.mysql.clusterj,com.mysql.clusterj.query,com.mysql.clusterj.annotation"  >> $(MANIFEST)
-	echo "Bundle-Name: ClusterJ API"  >> $(MANIFEST)
-	echo "Bundle-Description: The API for ClusterJ"  >> $(MANIFEST)
-	echo "Bundle-SymbolicName: com.mysql.clusterj.clusterj-api" >> $(MANIFEST)
-
-classclusterj_api.stamp: $(clusterj_api_java)
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_api.stamp
-
-$(clusterj_api_version_JAR): classclusterj_api.stamp $(MANIFEST)
-	rm -f $@; @JAR@ cvfm $@ $(MANIFEST) \
-	  -C $(JAVAROOT) com/mysql/clusterj 
-
-## create a versioned link
-install-data-hook:
-	cd $(DESTDIR)/$(clusterj_apidir) && \
-	$(LN_CP_F) -f $(clusterj_api_version_JAR) $(clusterj_api_JAR)
-
-CLEANFILES= $(clusterj_api_version_JAR) classclusterj_api.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/com/mysql/clusterj/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/query/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/annotation/*.class 
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-api/target
-

=== removed file 'storage/ndb/clusterj/clusterj-core/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-core/Makefile.am	2011-06-20 23:34:36 +0000
+++ b/storage/ndb/clusterj/clusterj-core/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-#   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_core_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-core/src/main/java
-
-clusterj_core_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-core/src/main/resources
-
-JAVAROOT=$(top_srcdir)/storage/ndb/clusterj/clusterj-core/target/classes
-
-CLASSPATH_ENV=CLASSPATH=$(JAVAROOT):$(top_srcdir)/storage/ndb/clusterj/clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar
-
-clusterj_core_java = \
-  $(clusterj_core_src)/com/mysql/clusterj/core/CacheManager.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/IndexHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/AndPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/BetweenPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/CandidateIndexImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/ComparativePredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/EqualPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/LessThanPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/LikePredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/ParameterImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/PredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/PropertyImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/QueryBuilderImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/QueryImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/InPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/NotPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/OrPredicateImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/SessionFactoryImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/SessionFactoryServiceImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/SessionImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/DomainFieldHandler.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/DomainTypeHandler.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/DomainTypeHandlerFactory.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/QueryExecutionContext.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/SessionSPI.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/ValueHandler.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/StateManager.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Blob.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ClusterConnection.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ClusterConnectionService.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ClusterTransaction.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Column.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Db.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Dictionary.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Index.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/IndexOperation.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/IndexScanOperation.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Operation.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ResultData.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ScanFilter.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/ScanOperation.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/Table.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/PartitionKey.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/StoreManager.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/TransactionImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/I18NHelper.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/JDK14LoggerFactoryImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/JDK14LoggerImpl.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/Logger.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/LoggerFactory.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/LoggerFactoryService.java 
-noinst_DATA = classclusterj_core.stamp
-
-EXTRA_DIST = \
-  $(clusterj_core_res)/META-INF \
-  $(clusterj_core_res)/com/mysql/clusterj/core/Bundle.properties \
-  $(clusterj_core_src)/com/mysql/clusterj/core/*.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/metadata/*.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/query/*.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/spi/*.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/store/*.java \
-  $(clusterj_core_src)/com/mysql/clusterj/core/util/*.java \
-  pom.xml CMakeLists.txt
-
-classclusterj_core.stamp: $(clusterj_core_java)
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_core.stamp
-
-CLEANFILES= classclusterj_core.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/com/mysql/clusterj/core/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/core/metadata/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/core/query/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/core/spi/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/core/store/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/core/util/*.class 
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-core/target
-
-

=== removed file 'storage/ndb/clusterj/clusterj-jdbc/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-jdbc/Makefile.am	2011-06-20 23:34:36 +0000
+++ b/storage/ndb/clusterj/clusterj-jdbc/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-#   Copyright 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-#include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_jdbc_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/java
-
-clusterj_jdbc_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/resources
-
-MANIFEST = MANIFEST.MF
-
-JAVAROOT=$(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target/classes
-
-CLASSPATH_ENV = CLASSPATH=@CLUSTERJ_CLASSPATH@:$(JAVAROOT):$(top_srcdir)/storage/ndb/clusterj/clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/clusterj/clusterj-core/target/classes
-
-clusterj_jdbcdir= $(prefix)/share/mysql/java/
-
-clusterj_jdbc_version_JAR = clusterj-jdbc-@JAVA_NDB_VERSION@.jar
-clusterj_jdbc_JAR = clusterj-jdbc.jar
-
-clusterj_jdbc_java = \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/ConnectionLifecycleInterceptor.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/DomainFieldHandlerImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/InterceptorImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/SQLExecutor.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/StatementInterceptor.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/ValueHandlerImpl.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseFileStream.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseStringStream.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/BaseErrorListener.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/ErrorListener.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/MySQLLexer.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/MySQLParser.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/QueuingErrorListener.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/RecognizerErrorDelegate.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/AndNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/BetweenNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/BinaryOperatorNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/BooleanOperatorNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/CommandNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/DeleteNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/EqualsNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/GreaterEqualsNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/GreaterThanNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/InsertNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/LessEqualsNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/LessThanNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/Node.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/NotNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/OrNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/ParensNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/PlaceholderNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/PredicateNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/SelectNode.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/WhereNode.java 
-
-clusterj_jdbc_DATA = $(clusterj_jdbc_version_JAR)
-
-$(MANIFEST): 
-	echo "Manifest-Version: 1.0"  > $(MANIFEST) 
-	echo "Export-Package: com.mysql.clusterj,com.mysql.clusterj.query,com.mysql.clusterj.annotation"  >> $(MANIFEST)
-	echo "Bundle-Name: ClusterJ JDBC"  >> $(MANIFEST)
-	echo "Bundle-Description: The JDBC interception for ClusterJ"  >> $(MANIFEST)
-	echo "Bundle-SymbolicName: com.mysql.clusterj.clusterj-jdbc" >> $(MANIFEST)
-
-clusterj_jdbc_antlr = \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g
-
-clusterj_jdbc_antlr_src = \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target/generated-sources/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.java \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target/generated-sources/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.java \
-  $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target/generated-sources/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser_MySQL51Functions.java
-
-classclusterj_jdbc.stamp: $(clusterj_jdbc_java) $(clusterj_jdbc_antlr)
-	if ! test -e classclusterj_jdbc_antlr.stamp; then \
-	  mkdir -p $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target/generated-sources/antlr3; \
-	  cd $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3 && \
-	    $(CLASSPATH_ENV) java org.antlr.Tool \
-	    -lib imports \
-	    -o  @abs_top_srcdir@/storage/ndb/clusterj/clusterj-jdbc/target/generated-sources/antlr3 \
-	    com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g \
-	    com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g; \
-	    cd @abs_top_srcdir@/storage/ndb/clusterj/clusterj-jdbc; \
-	  echo timestamp > classclusterj_jdbc_antlr.stamp; \
-	fi
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $(clusterj_jdbc_java) $(clusterj_jdbc_antlr_src)' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $(clusterj_jdbc_java) $(clusterj_jdbc_antlr_src); \
-	fi
-	echo timestamp > classclusterj_jdbc.stamp
-
-$(clusterj_jdbc_version_JAR): classclusterj_jdbc.stamp $(MANIFEST)
-	rm -f $@; @JAR@ cvfm $@ $(MANIFEST) \
-	  -C $(JAVAROOT) com/mysql/clusterj 
-
-## create a versioned link
-install-data-hook:
-	cd $(DESTDIR)/$(clusterj_jdbcdir) && \
-	$(LN_CP_F) -f $(clusterj_jdbc_version_JAR) $(clusterj_jdbc_JAR)
-
-CLEANFILES= $(clusterj_jdbc_version_JAR) classclusterj_jdbc_antlr.stamp classclusterj_jdbc.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/com/mysql/clusterj/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/query/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/annotation/*.class \
-  $(clusterj_jdbc_antlr_src)
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-EXTRA_DIST = \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/*.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/*.java \
-  $(clusterj_jdbc_src)/com/mysql/clusterj/jdbc/antlr/node/*.java \
-  logging.properties pom.xml CMakeLists.txt \
-  $(clusterj_jdbc_antlr)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-jdbc/target
-

=== removed file 'storage/ndb/clusterj/clusterj-jpatest/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-jpatest/Makefile.am	2011-05-19 21:18:12 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-#   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_jpatest_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-jpatest/src/main/java
-
-clusterj_jpatest_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-jpatest/src/main/resources
-
-MANIFEST = MANIFEST.MF
-
-JAVAROOT = $(top_srcdir)/storage/ndb/clusterj/clusterj-jpatest/target/classes
-
-CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):@CLUSTERJ_CLASSPATH@:../clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar
-
-clusterj_jpatestdir= $(prefix)/share/mysql/java/
-
-clusterj_jpatest_version_JAR = clusterj-jpatest-@JAVA_NDB_VERSION@.jar
-
-clusterj_jpatest_DATA = $(clusterj_jpatest_version_JAR)
-
-clusterj_jpatest_java = \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/AbstractJPABaseTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/BigIntegerTypesTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/BlobTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/ClobTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/DateAsSqlDateTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/DateAsUtilDateTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/DatetimeAsSqlTimestampTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/DatetimeAsUtilDateTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/DecimalTypesTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/Driver.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/EmbeddedTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/JpaLoad.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/LazyTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/A.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/B0.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/BigIntegerTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/BlobTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/ClobTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/DateAsSqlDateTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/DateAsUtilDateTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/DatetimeAsSqlTimestampTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/DatetimeAsUtilDateTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/DecimalTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/Embedded.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/Embedding.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/Employee.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/IdBase.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongIntStringConstants.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongIntStringOid.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongLongStringConstants.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongLongStringFKManyOne.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongLongStringOid.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongLongStringPK.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LongLongStringPKOneMany.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/TimeAsSqlTimeTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/TimeAsUtilDateTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/TimestampAsSqlTimestampTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/TimestampAsUtilDateTypes.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/LazyEmployee.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/PersistenceTestCase.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/SingleEMFTestCase.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/SingleEMTestCase.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/TimeAsSqlTimeTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/TimeAsUtilDateTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/SlowTest.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/Ignore.java
-
-EXTRA_DIST= \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/*.java \
-  $(clusterj_jpatest_src)/com/mysql/clusterj/jpatest/model/*.java \
-  $(clusterj_jpatest_res)/META-INF/persistence.xml \
-   pom.xml CMakeLists.txt
-
-$(MANIFEST):
-	echo "Manifest-Version: 1.0"  > $(MANIFEST)
-	echo "Export-Package: com.mysql.clusterj.jpatest,com.mysql.clusterj.jpatest.model"  >> $(MANIFEST)
-	echo "Bundle-Name: ClusterJ API"  >> $(MANIFEST)
-	echo "Bundle-Description: The API for ClusterJ"  >> $(MANIFEST)
-	echo "Bundle-SymbolicName: com.mysql.clusterj.clusterj-jpatest" >> $(MANIFEST)
-
-classPCEnhancer.stamp: classclusterj_jpatest.stamp
-	$(JAVA) -classpath "$(JAVAROOT):$(CLUSTERJ_CLASSPATH)" \
-	org.apache.openjpa.enhance.PCEnhancer \
-	-p $(clusterj_jpatest_res)/META-INF/persistence.xml -d $(JAVAROOT);
-	echo timestamp > classPCEnhancer.stamp
-
-classclusterj_jpatest.stamp: $(clusterj_jpatest_java)
-	mkdir -p  $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_jpatest.stamp
-
-$(clusterj_jpatest_version_JAR) : classPCEnhancer.stamp $(MANIFEST)
-	rm -f $@ ; $(JAR) cvfm $@ $(MANIFEST) \
-  	  -C $(JAVAROOT) com/mysql/clusterj/jpatest \
-	  -C $(clusterj_jpatest_res) META-INF/persistence.xml 
-
-CLEANFILES= $(clusterj_jpatest_version_JAR) \
-	classclusterj_jpatest.stamp classPCEnhancer.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/com/mysql/clusterj/jpatest/*.class \
-  $(JAVAROOT)/com/mysql/clusterj/jpatest/model/*.class
-
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-jpatest/target

=== removed file 'storage/ndb/clusterj/clusterj-openjpa/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-openjpa/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-#   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_openjpa_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/src/main/java
-
-clusterj_openjpa_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/src/main/resources
-
-clusterj_openjpa_test = $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/src/test/java
-
-clusterj_openjpa_test_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/src/test/resources
-
-clusterj_openjpadir= $(prefix)/share/mysql/java/
-
-clusterjpa_version_jar = clusterjpa-$(JAVA_NDB_VERSION).jar
-clusterjpa_jar = clusterjpa.jar
-
-OPENJPA_EXPORT=com.mysql.clusterj.openjpa
-
-CLUSTERJPA_JAR_DIRS = clusterj-api clusterj-core clusterj-tie clusterj-openjpa 
-
-CLUSTERJPA_MANIFEST = CLUSTERJPA_MANIFEST.MF
-
-JAVAROOT = $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/target/classes
-
-CLASSPATH_ENV = CLASSPATH=@CLUSTERJ_CLASSPATH@:$(JAVAROOT):$(top_srcdir)/storage/ndb/clusterj/clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/clusterj/clusterj-core/target/classes:$(top_srcdir)/storage/ndb/clusterj/clusterj-jpatest/clusterj-jpatest-@JAVA_NDB_VERSION@.jar
-
-clusterj_openjpa_java = \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAResult.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAConfiguration.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAConfigurationImpl.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAStoreManager.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAValueHandler.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPABrokerFactory.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAProductDerivation.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAStoreQuery.java \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/NdbOpenJPAUtility.java 
-
-clusterj_openjpa_tests = \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/BasicTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/BigIntegerTypesTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/BlobTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/ClobTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/CrundTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/DateAsSqlDateTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/DateAsUtilDateTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/DatetimeAsSqlTimestampTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/DatetimeAsUtilDateTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/DecimalTypesTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/EmbeddedTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/LongIntStringPKOneOneTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/LongLongStringPKOneManyTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/LongLongStringPKTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/TimeAsSqlTimeTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/TimeAsUtilDateTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/TimestampAsSqlTimestampTest.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/TimestampAsUtilDateTest.java
-
-clusterj_openjpa_DATA = $(clusterjpa_version_jar)
-
-EXTRA_DIST = \
-  $(clusterj_openjpa_res)/META-INF/services/* \
-  $(clusterj_openjpa_res)/com/mysql/clusterj/openjpa/Bundle.properties \
-  $(clusterj_openjpa_src)/com/mysql/clusterj/openjpa/*.java \
-  $(clusterj_openjpa_test)/com/mysql/clusterj/openjpatest/*.java \
-  pom.xml CMakeLists.txt
-
-$(CLUSTERJPA_MANIFEST):
-	if test "$(OPENJPA_OPT)" == "clusterj-openjpa"; then \
-	  echo "Manifest-Version: 1.0"  > $(CLUSTERJPA_MANIFEST); \
-	  echo "Export-Package: $(CLUSTERJ_EXPORT),$(OPENJPA_EXPORT)"  >> $(CLUSTERJPA_MANIFEST); \
-	  echo "Bundle-Name: ClusterJ API"  >> $(CLUSTERJPA_MANIFEST); \
-	  echo "Bundle-Description: The API for ClusterJ"  >> $(CLUSTERJPA_MANIFEST); \
-	fi;
-
-classclusterj_openjpa.stamp: $(clusterj_openjpa_java)
-	mkdir -p  $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_openjpa.stamp
-
-# basically do nothing if OPENJPA_OPT is not set
-$(clusterjpa_version_jar) : classclusterj_openjpa.stamp $(CLUSTERJPA_MANIFEST)
-	rm -f $@; \
-	@JAR@ cvfm $@ $(CLUSTERJPA_MANIFEST); \
-	for i in $(CLUSTERJPA_JAR_DIRS); do \
-	  BASE_NAME=`echo $$i | sed 's/clusterj-//'`; \
-	  @JAR@ uvf $@ -C ../$$i/target/classes com/mysql; \
-	  if test -x ../$$i/src/main/resources/META-INF/services; then \
-	    @JAR@ uvf $@ -C ../$$i/src/main/resources META-INF/services; \
-	  fi; \
-	  BUNDLE=../$$i/src/main/resources/com/mysql/clusterj/$$BASE_NAME/Bundle.properties; \
-	  if test -e $$BUNDLE; then \
-	    @JAR@ uvf $@ -C ../$$i/src/main/resources com/mysql/clusterj/$$BASE_NAME/Bundle.properties; \
-	  fi; \
-	done; \
-	@JAR@ uvf $@ -C ../../src/ndbjtie/target/classes com/mysql; \
-	@JAR@ uvf $@ -C ../../src/ndbjtie/jtie/target/classes com/mysql; \
-	echo $$CLASS_DIRS;
-
-## create a versioned link
-install-data-hook:
-	cd $(DESTDIR)/$(clusterj_openjpadir) && \
-	$(LN_CP_F) -f $(clusterjpa_version_jar) $(clusterjpa_jar)
-
-CLEANFILES= classclusterj_openjpa.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/com/mysql/clusterj/openjpa/*.class
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-openjpa/target

=== removed file 'storage/ndb/clusterj/clusterj-test/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-test/Makefile.am	2011-06-20 23:34:36 +0000
+++ b/storage/ndb/clusterj/clusterj-test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,213 +0,0 @@
-#   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_test_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-test/src/main/java
-
-clusterj_test_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-test/src/main/resources
-
-MANIFEST = MANIFEST.MF
-
-JAVAROOT = $(top_srcdir)/storage/ndb/clusterj/clusterj-test/target/classes
-
-CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(top_srcdir)/storage/ndb/clusterj/clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/clusterj/clusterj-core/target/classes:@CLUSTERJ_CLASSPATH@
-
-clusterj_testdir= $(prefix)/share/mysql/java/
-
-clusterj_test_version_JAR = clusterj-test-@JAVA_NDB_VERSION@.jar
-
-clusterj_test_DATA = $(clusterj_test_version_JAR) 
-
-clusterj_test_java = \
-  $(clusterj_test_src)/regression/Bug54619.java \
-  $(clusterj_test_src)/testsuite/clusterj/AbstractClusterJModelTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/AbstractClusterJTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/AbstractQueryTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/AllTests.java \
-  $(clusterj_test_src)/testsuite/clusterj/AutoCommitTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/BigIntegerTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/BinaryTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/BinaryPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/BitTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/BlobTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/CharsetTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/ConnectionPoolTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DateAsSqlDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DateAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DatetimeAsSqlTimestampTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DatetimeAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DecimalTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DefaultConnectValuesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DeleteAllByClassTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DeleteInsertTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DeleteQueryAllPrimitivesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DomainTypeHandlerFactoryTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DynamicBinaryPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/DynamicObjectTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/FindByPrimaryKey2Test.java \
-  $(clusterj_test_src)/testsuite/clusterj/FindByPrimaryKeyTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/HashOnlyLongIntStringPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/LoadTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/LongIntStringPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/LongLongStringPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/LongvarbinaryPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/MultiplePKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/MultithreadedFindTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/MultithreadedTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/NegativeMetadataTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/NotPersistentTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/NullValuesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/ObjectNotFoundTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/PartitionKeyTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryAllPrimitivesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryBigIntegerTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryBtreeIndexScanTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryByteArrayTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDateAsSqlDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDateAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDatetimeAsSqlTimestampTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDatetimeAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDecimalTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryDoubleTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryExplainTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryExtraConditionsTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryFloatTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryHashIndexScanTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryInTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryLikeTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryLikeByteArrayTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryMultiColumnIndexInTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryMultipleParameterTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryNotNullTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryNotTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryNullTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryOrTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryPrimaryKeyTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryStringTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryTableScanTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryTimeAsSqlTimeTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryTimeAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryTimestampAsSqlTimestampTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryTimestampAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryUniqueKeyTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/QueryYearTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/SaveTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/SerialTransactionsTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/TimeAsSqlTimeTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/TimeAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/TimestampAsSqlTimestampTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/TimestampAsUtilDateTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/TransactionStateTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/UpdateTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/VarbinaryPKTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/VarbinaryTypesTest.java \
-  $(clusterj_test_src)/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/AllPrimitives.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadEmployeeNoPrimaryKeyAnnotationOnClass.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationColumnAndColumns.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationNoColumnOrColumns.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationOnClassMisspelledField.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadEmployeeWrongPrimaryKeyAnnotationOnClass.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadIndexDuplicateColumn.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadIndexDuplicateIndexName.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BadIndexMissingColumn.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BigIntegerTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BinaryTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BinaryPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BitTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/BlobTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/ByteArrayTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CharsetBig5.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CharsetLatin1.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CharsetModel.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CharsetSjis.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CharsetUtf8.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/CrazyDelegate.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/Customer.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DateAsSqlDateTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DateAsUtilDateTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DatetimeAsSqlTimestampTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DatetimeAsUtilDateTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DecimalTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/Dn2id.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DoubleTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/DynamicPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/Employee.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/Employee2.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/FloatTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/HashOnlyLongIntStringPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/IdBase.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/IndexesRUs.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/LongIntStringIndex.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/LongIntStringPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/LongLongStringPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/LongvarbinaryPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/NotPersistentTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/NullValues.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/Order.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/OrderLine.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/StringTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/ThrowNullPointerException.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/TimeAsSqlTimeTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/TimeAsUtilDateTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/TimestampAsSqlTimestampTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/TimestampAsUtilDateTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/VarbinaryPK.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/VarbinaryTypes.java \
-  $(clusterj_test_src)/testsuite/clusterj/model/YearTypes.java
-
-EXTRA_DIST = \
-  src/main/resources/META-INF \
-  src/main/resources/schema.sql \
-  $(clusterj_test_java) \
-  pom.xml CMakeLists.txt
-
-$(MANIFEST):
-	echo "Manifest-Version: 1.0"  > $(MANIFEST)
-	echo "Export-Package: regression,testsuite.clusterj,testsuite.clusterj.model,testsuite.clusterj.domaintypehandler"  >> $(MANIFEST)
-	echo "Bundle-Name: ClusterJ Test"  >> $(MANIFEST)
-	echo "Bundle-Description: The Test Suite for ClusterJ"  >> $(MANIFEST)
-	echo "Bundle-SymbolicName: com.mysql.clusterj.clusterj-test" >> $(MANIFEST)
-
-classclusterj_test.stamp: $(clusterj_test_java)
-	mkdir -p  $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_test.stamp
-
-
-$(clusterj_test_version_JAR) : classclusterj_test.stamp $(MANIFEST)
-	rm -f $@ ; @JAR@ cvfm $@ $(MANIFEST) \
-	  -C $(clusterj_test_res) META-INF \
-	  -C $(clusterj_test_res) schema.sql \
-	  -C $(JAVAROOT) testsuite/clusterj
-
-CLEANFILES= $(clusterj_test_version_JAR) classclusterj_test.stamp
-
-clean-local:
-	rm -f $(JAVAROOT)/testsuite/clusterj/*.class \
-  $(JAVAROOT)/testsuite/clusterj/model/*.class \
-  $(JAVAROOT)/testsuite/clusterj/domaintypehandler/*.class
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-test/target

=== removed file 'storage/ndb/clusterj/clusterj-tie/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-tie/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-#   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 of the License.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-clusterj_tie_src = $(top_srcdir)/storage/ndb/clusterj/clusterj-tie/src/main/java
-clusterj_tie_test = $(top_srcdir)/storage/ndb/clusterj/clusterj-tie/src/test/java
-
-clusterj_tie_res = $(top_srcdir)/storage/ndb/clusterj/clusterj-tie/src/main/resources
-
-CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(top_srcdir)/storage/ndb/src/ndbjtie/ndbjtie-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/src/ndbjtie/jtie/jtie-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/clusterj/clusterj-api/clusterj-api-@JAVA_NDB_VERSION@.jar:$(top_srcdir)/storage/ndb/clusterj/clusterj-core/target/classes
-
-JAVAROOT = $(top_srcdir)/storage/ndb/clusterj/clusterj-tie/target/classes
-
-clusterj_tie_java= \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/Utility.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/BlobImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ClusterConnectionImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ClusterTransactionImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ColumnImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/DbImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/DictionaryImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/IndexImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/IndexOperationImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/IndexScanOperationImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/OperationImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ResultDataImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ScanFilterImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ScanOperationImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/ScanResultDataImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/TableImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/KeyPart.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/PartitionKeyImpl.java \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/KeyPart.java 
-
-
-noinst_DATA = classclusterj_tie.stamp 
-
-EXTRA_DIST = \
-  src/main/resources/META-INF \
-  src/test/resources/clusterj.properties \
-  src/main/resources/com/mysql/clusterj/tie/Bundle.properties \
-  $(clusterj_tie_src)/com/mysql/clusterj/tie/*.java \
-  $(clusterj_tie_test)/testsuite/clusterj/tie/*.java \
-  pom.xml CMakeLists.txt
-
-classclusterj_tie.stamp: $(clusterj_tie_java)
-	mkdir -p  $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classclusterj_tie.stamp
-
-CLEANFILES= classclusterj_tie.stamp
-
-clean-local:
-	rm -rf $(JAVAROOT)/com/mysql/clusterj/tie/*.class
-
-MOSTLYCLEANFILES = $(MANIFEST)
-
-mostlyclean-local: clean-local
-	rm -rf $(top_srcdir)/storage/ndb/clusterj/clusterj-tie/target

=== removed file 'storage/ndb/docs/Makefile.am'
--- a/storage/ndb/docs/Makefile.am	2011-04-14 15:40:04 +0000
+++ b/storage/ndb/docs/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-DOXYDIR = doxygen
-noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi 
-
-all-local: 	do-check-html ndbapidoc-html mgmapidoc-html
-all-pdf: 	do-check-pdf ndbapidoc-pdf mgmapidoc-pdf
-
-DOXYTMP =	.doxytmp
-DOXYOUT =	.doxyout
-
-NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
-
-clean-local:
-	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
-	rm -rf $(DOXYTMP) $(DOXYOUT)
-
-do-check-html:
-	@set -x; \
-	if test @PERL@ = no ; then \
-	  echo "Perl needed to make docs"; \
-	  exit 1; \
-	fi; \
-	if test @DOXYGEN@ = no ; then \
-	  echo "Doxygen needed to make docs"; \
-	  exit 1; \
-	fi;
-
-do-check-pdf: do-check-html
-	if test @PDFLATEX@ = no ; then \
-	  echo "Pdflatex needed to make docs"; \
-	  exit 1; \
-	fi; \
-	if test @MAKEINDEX@ = no ; then \
-	  echo "Makeindex needed to make docs"; \
-	  exit 1; \
-	fi;
-
-###
-#
-#  NDB API Programmer's Guide
-#
-ndbapidoc-html: ndbapi.html
-ndbapidoc-pdf: ndbapi.pdf
-
-ndbapi.html: $(noinst_HEADERS)
-	@set -x; \
-	export NDB_RELEASE=$(NDB_RELEASE); \
-	@RM@ -f ndbapi.pdf ndbapi.html; \
-	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	@CP@ $(top_srcdir)/storage/ndb/include/ndbapi/*  $(DOXYTMP); \
-	@CP@ $(top_srcdir)/storage/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
-	@PERL@ $(DOXYDIR)/predoxy.pl; \
-	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
-	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "MySQL Cluster NDB API Programmer Guide"; \
-	(cd $(DOXYOUT) && \
-		find ndbapi.html -print | cpio -pdm ..);
-
-ndbapi.pdf: ndbapi.html
-	(cd $(DOXYOUT)/ndbapi.latex && \
-		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
-		cp -p refman.pdf ../../ndbapi.pdf);
-
-###
-#
-#  MGM API Guide
-#
-mgmapidoc-html: mgmapi.html
-mgmapidoc-pdf: mgmapi.pdf
-
-mgmapi.html: $(noinst_HEADERS)
-	@set -x; \
-	export NDB_RELEASE=$(NDB_RELEASE); \
-	@RM@ -f mgmapi.pdf mgmapi.html; \
-	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	@CP@ $(top_srcdir)/storage/ndb/include/mgmapi/*  $(DOXYTMP); \
-	@PERL@ $(DOXYDIR)/predoxy.pl; \
-	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
-	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/mgmapi.latex "MySQL Cluster MGM API Guide"; \
-	(cd $(DOXYOUT) && \
-		find mgmapi.html -print | cpio -pdm ..);
-
-mgmapi.pdf: mgmapi.html
-	(cd $(DOXYOUT)/mgmapi.latex && \
-		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
-		cp -p refman.pdf ../../mgmapi.pdf);
-
-###
-#  
-#  Complete Source Browser except for 
-#        ndbapi odbc test tools win32 lib examples docs CVS config bin 
-#        include/ndbapi 
-#        include/newtonapi src/newtonapi
-#        include/mgmapi src/mgmapi
-#        src/client
-ndbdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
-
-###
-#
-#  odbcdoc - Complete Source Browser for NDB ODBC (src/client/odbc)
-
-odbcdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
-
-testdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
-

=== removed file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/include/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-ndbinclude_HEADERS = \
-ndb_constants.h \
-ndb_init.h \
-ndb_types.h \
-ndb_version.h
-
-ndbapiinclude_HEADERS = \
-ndbapi/ndbapi_limits.h \
-ndbapi/ndb_opt_defaults.h \
-ndbapi/Ndb.hpp \
-ndbapi/NdbApi.hpp \
-ndbapi/NdbTransaction.hpp \
-ndbapi/NdbDictionary.hpp \
-ndbapi/NdbError.hpp \
-ndbapi/NdbEventOperation.hpp \
-ndbapi/NdbIndexOperation.hpp \
-ndbapi/NdbOperation.hpp \
-ndbapi/ndb_cluster_connection.hpp \
-ndbapi/NdbBlob.hpp \
-ndbapi/NdbPool.hpp \
-ndbapi/NdbRecAttr.hpp \
-ndbapi/NdbReceiver.hpp \
-ndbapi/NdbScanFilter.hpp \
-ndbapi/NdbScanOperation.hpp \
-ndbapi/NdbIndexScanOperation.hpp \
-ndbapi/NdbIndexStat.hpp \
-ndbapi/ndberror.h \
-ndbapi/NdbInterpretedCode.hpp
-
-mgmapiinclude_HEADERS = \
-mgmapi/mgmapi.h \
-mgmapi/mgmapi_error.h \
-mgmapi/mgmapi_debug.h \
-mgmapi/mgmapi_config_parameters.h \
-mgmapi/mgmapi_config_parameters_debug.h \
-mgmapi/ndb_logevent.h \
-mgmapi/ndbd_exit_codes.h
-
-noinst_HEADERS = \
-ndb_global.h \
-ndb_net.h
-
-EXTRA_DIST = debugger kernel logger mgmcommon \
-portlib transporter util CMakeLists.txt ndb_config.h.in
-

=== removed file 'storage/ndb/src/Makefile.am'
--- a/storage/ndb/src/Makefile.am	2011-06-15 14:21:47 +0000
+++ b/storage/ndb/src/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = common mgmapi ndbapi @NDBJTIE_OPT@ . kernel mgmclient mgmsrv cw
-
-DIST_SUBDIRS = common mgmapi ndbapi ndbjtie . kernel mgmclient mgmsrv cw
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-ndblib_LTLIBRARIES = libndbclient.la
-
-libndbclient_la_SOURCES =
-
-libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@
-
-libndbclient_la_LIBADD =  \
-              ndbapi/libndbapi.la \
-              $(top_builddir)/strings/libmystringslt.la \
-              $(top_builddir)/mysys/libmysyslt.la \
-              $(top_builddir)/dbug/libdbuglt.la \
-              common/transporter/libtransporter.la   \
-              common/debugger/libtrace.la     \
-              common/debugger/signaldata/libsignaldataprint.la \
-              mgmapi/libmgmapi.la \
-              common/mgmcommon/libmgmsrvcommon.la \
-              common/logger/liblogger.la       \
-              common/portlib/libportlib.la      \
-              common/util/libgeneral.la \
-              @NDBJTIE_LIBS@ \
-              @ZLIB_LIBS@ 
-

=== removed file 'storage/ndb/src/common/Makefile.am'
--- a/storage/ndb/src/common/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/common/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS =	portlib debugger util logger transporter mgmcommon
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libcommon.la
-
-libcommon_la_SOURCES =
-libcommon_la_LIBADD = \
-              transporter/libtransporter.la   \
-              debugger/libtrace.la     \
-              debugger/signaldata/libsignaldataprint.la \
-              mgmcommon/libmgmsrvcommon.la \
-              portlib/libportlib.la      \
-              logger/liblogger.la       \
-              util/libgeneral.la 
-

=== removed file 'storage/ndb/src/common/debugger/Makefile.am'
--- a/storage/ndb/src/common/debugger/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/common/debugger/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = signaldata
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libtrace.la
-
-libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-

=== removed file 'storage/ndb/src/common/debugger/signaldata/Makefile.am'
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am	2011-06-07 13:47:21 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libsignaldataprint.la
-
-libsignaldataprint_la_SOURCES = \
-          TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp \
-	  TcRollbackRep.cpp \
-          TupKey.cpp TupCommit.cpp LqhKey.cpp \
-          FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp\
-          SignalDataPrint.cpp SignalNames.cpp \
-          ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \
-          CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \
-	  GCP.cpp DictTabInfo.cpp \
-	  AlterTable.cpp AlterTab.cpp \
-	  CreateTrig.cpp DropTrig.cpp \
-	  FireTrigOrd.cpp TrigAttrInfo.cpp \
-	  CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp \
-	  IndxKeyInfo.cpp IndxAttrInfo.cpp \
-          FsAppendReq.cpp ScanTab.cpp \
-          BackupImpl.cpp BackupSignalData.cpp \
-          UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp \
-          LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp \
-          CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \
-          FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
-          SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
-	  UtilLock.cpp TuxMaint.cpp AccLock.cpp \
-          LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp \
-          ScanFrag.cpp \
-	  SchemaTrans.cpp SchemaTransImpl.cpp GetTabInfo.cpp \
- 	  CreateTab.cpp CreateTable.cpp DropTable.cpp \
-  	  CreateTrigImpl.cpp DropTrigImpl.cpp \
- 	  CreateIndxImpl.cpp DropIndxImpl.cpp AlterIndxImpl.cpp \
- 	  BuildIndx.cpp BuildIndxImpl.cpp ApiVersion.cpp \
-          LocalRouteOrd.cpp DbinfoScan.cpp NodePing.cpp \
-	  IndexStatSignal.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-

=== removed file 'storage/ndb/src/common/logger/Makefile.am'
--- a/storage/ndb/src/common/logger/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/common/logger/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt \
-  message.mc message.h message.rc MSG00001.bin
-
-noinst_LTLIBRARIES = liblogger.la
-
-liblogger_la_SOURCES = Logger.cpp \
-  LogHandlerList.cpp LogHandler.cpp \
-  ConsoleLogHandler.cpp FileLogHandler.cpp \
-  SysLogHandler.cpp EventLogHandler.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-

=== removed file 'storage/ndb/src/common/mgmcommon/Makefile.am'
--- a/storage/ndb/src/common/mgmcommon/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libmgmsrvcommon.la
-
-libmgmsrvcommon_la_SOURCES = \
-	ConfigRetriever.cpp \
-	IPCConfig.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmsrv
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
-

=== removed file 'storage/ndb/src/common/portlib/Makefile.am'
--- a/storage/ndb/src/common/portlib/Makefile.am	2011-05-12 07:21:14 +0000
+++ b/storage/ndb/src/common/portlib/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libportlib.la
-
-libportlib_la_SOURCES = \
-	NdbCondition.c NdbMutex.c NdbTick.c \
-	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp	    \
-	ndb_daemon.cc NdbMem.c \
-	NdbConfig.c NdbDir.cpp ndb_socket.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-
-INCLUDES += -I$(top_srcdir)/ndb/include/util -I$(top_srcdir)/ndb/include/ndbapi
-
-EXTRA_PROGRAMS = memtest PortLibTest munmaptest
-
-PortLibTest_SOURCES = NdbPortLibTest.cpp
-munmaptest_SOURCES = munmaptest.cpp
-
-noinst_PROGRAMS = NdbDir-t NdbNuma-t NdbGetInAddr-t
-
-NdbDir_t_SOURCES = NdbDir.cpp \
-       $(top_srcdir)/storage/ndb/src/common/util/basestring_vsnprintf.c
-NdbDir_t_CXXFLAGS = -DTEST_NDBDIR
-NdbDir_t_LDADD = \
-       libportlib.la \
-       $(top_builddir)/mysys/libmysyslt.la
-
-NdbNuma_t_SOURCES = NdbNuma.cpp 
-NdbNuma_t_CXXFLAGS = -DTEST_NDBNUMA
-NdbNuma_t_LDADD = $(top_builddir)/mysys/libmysyslt.la @LIBDL@
-
-NdbGetInAddr_t_SOURCES = NdbTCP.cpp
-NdbGetInAddr_t_CXXFLAGS = -DTEST_NDBGETINADDR

=== removed file 'storage/ndb/src/common/transporter/Makefile.am'
--- a/storage/ndb/src/common/transporter/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/common/transporter/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libtransporter.la
-
-libtransporter_la_SOURCES = \
-	Transporter.cpp \
-	TCP_Transporter.cpp \
-	Loopback_Transporter.cpp \
-	TransporterRegistry.cpp \
-        Packer.cpp
-
-EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
-
-libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
-libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/include/debugger -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/include/transporter @NDB_SCI_INCLUDES@
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-

=== removed file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2011-05-24 10:08:22 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libgeneral.la libndbazio.la
-
-libgeneral_la_SOURCES = \
-	    File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \
-            SimpleProperties.cpp Parser.cpp InputStream.cpp \
-            SocketServer.cpp SocketClient.cpp SocketAuthenticator.cpp\
-	    OutputStream.cpp NdbOut.cpp BaseString.cpp \
-            NdbSqlUtil.cpp \
-            uucode.c random.c version.cpp ndb_opts.c \
-            strdup.c \
-            ConfigValues.cpp ndb_init.cpp basestring_vsnprintf.c \
-            Bitmask.cpp SparseBitmask.cpp parse_mask.hpp \
-	    ndb_rand.c require.c Vector.cpp \
-	    NdbPack.cpp
-
-INCLUDES_LOC = @ZLIB_INCLUDES@
-
-libndbazio_la_SOURCES = ndbzio.c
-libndbazio_la_LIBADD = @ZLIB_LIBS@
-
-noinst_PROGRAMS = BaseString-t HashMap-t Bitmask-t SparseBitmask-t ndb_version-t NdbPack-t
-
-BaseString_t_SOURCES = BaseString.cpp
-BaseString_t_CXXFLAGS = -DTEST_BASE_STRING
-BaseString_t_LDADD = \
-	libgeneral.la \
-	$(top_builddir)/mysys/libmysyslt.la
-
-HashMap_t_SOURCES = HashMap.cpp
-HashMap_t_CXXFLAGS = -DTEST_HASH
-HashMap_t_LDADD = \
-	libgeneral.la \
-	$(top_builddir)/mysys/libmysyslt.la \
-	$(top_builddir)/dbug/libdbuglt.la \
-	$(top_builddir)/strings/libmystringslt.la
-
-Bitmask_t_SOURCES = Bitmask.cpp
-Bitmask_t_CXXFLAGS = -DTEST_BITMASK
-Bitmask_t_LDADD = \
-	libgeneral.la \
-	$(top_builddir)/mysys/libmysyslt.la
-
-#Bitmask_p_SOURCES = Bitmask.cpp
-#Bitmask_p_CXXFLAGS = -DBENCH_BITMASK
-#Bitmask_p_LDADD = \
-#	libgeneral.la \
-#        ../portlib/libportlib.la \
-#	$(top_builddir)/mysys/libmysyslt.la
-
-SparseBitmask_t_SOURCES = SparseBitmask.cpp
-SparseBitmask_t_CXXFLAGS = -DTEST_SPARSEBITMASK
-SparseBitmask_t_LDADD = \
-	libgeneral.la \
-	$(top_builddir)/mysys/libmysyslt.la
-
-ndb_version_t_SOURCES = version.cpp
-ndb_version_t_CXXFLAGS = -DTEST_VERSION
-ndb_version_t_LDADD = libgeneral.la
-
-NdbPack_t_SOURCES = NdbPack.cpp
-NdbPack_t_CXXFLAGS = -DTEST_NDB_PACK
-NdbPack_t_LDADD = \
-	libgeneral.la \
-	$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
-	$(top_builddir)/mysys/libmysys.la \
-	$(top_builddir)/strings/libmystrings.la \
-	$(top_builddir)/dbug/libdbug.la
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== removed file 'storage/ndb/src/cw/Makefile.am'
--- a/storage/ndb/src/cw/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/cw/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = cpcd
-

=== removed file 'storage/ndb/src/cw/cpcd/Makefile.am'
--- a/storage/ndb/src/cw/cpcd/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/cw/cpcd/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-ndbbin_PROGRAMS = ndb_cpcd
-EXTRA_DIST = CMakeLists.txt
-
-ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
-
-LDADD_LOC = \
-            $(top_builddir)/storage/ndb/src/libndbclient.la      \
-            $(top_builddir)/dbug/libdbuglt.la \
-            $(top_builddir)/mysys/libmysyslt.la \
-            $(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-
-ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
-

=== removed file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = vm error blocks
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-ndbbin_PROGRAMS = ndbd
-EXTRA_PROGRAMS = ndbmtd
-
-if BUILD_NDBMTD
-ndbbin_PROGRAMS += ndbmtd
-endif
-
-ndbd_SOURCES = main.cpp ndbd.cpp angel.cpp SimBlockList.cpp \
-               $(top_srcdir)/storage/ndb/src/common/portlib/NdbNuma.cpp
-ndbmtd_SOURCES = main.cpp ndbd.cpp angel.cpp SimBlockList.cpp \
-                 $(top_srcdir)/storage/ndb/src/common/portlib/NdbNuma.cpp
-
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-INCLUDES += \
-	-I$(srcdir)/blocks/cmvmi \
-	-I$(srcdir)/blocks/dbacc \
-	-I$(srcdir)/blocks/dbdict \
-	-I$(srcdir)/blocks/dbdih \
-	-I$(srcdir)/blocks/dblqh \
-	-I$(srcdir)/blocks/dbspj \
-	-I$(srcdir)/blocks/dbtc \
-	-I$(srcdir)/blocks/dbtup \
-	-I$(srcdir)/blocks/ndbfs \
-	-I$(srcdir)/blocks/ndbcntr \
-	-I$(srcdir)/blocks/qmgr \
-	-I$(srcdir)/blocks/trix \
-	-I$(srcdir)/blocks/backup \
-	-I$(srcdir)/blocks/dbutil \
-	-I$(srcdir)/blocks/suma \
-	-I$(srcdir)/blocks/dbtux \
-	-I$(srcdir)/blocks/dbinfo \
-	-I$(srcdir)/blocks
-
-LIBS= \
-              blocks/libblocks.a \
-              vm/libkernel.a	\
-              error/liberror.a \
-              $(top_builddir)/storage/ndb/src/common/transporter/libtransporter.la   \
-              $(top_builddir)/storage/ndb/src/common/debugger/libtrace.la     \
-              $(top_builddir)/storage/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
-              $(top_builddir)/storage/ndb/src/common/logger/liblogger.la       \
-              $(top_builddir)/storage/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
-              $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
-              $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la      \
-              $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
-              $(top_builddir)/storage/ndb/src/common/util/libndbazio.la  \
-              $(top_builddir)/dbug/libdbuglt.la \
-              $(top_builddir)/mysys/libmysyslt.la \
-              $(top_builddir)/strings/libmystringslt.la \
-              @ZLIB_LIBS@ @NDB_SCI_LIBS@ @LIBDL@
-
-ndbd_LDADD = $(LIBS) vm/libsched.a
-ndbmtd_LDADD = $(LIBS) vm/libsched_mt.a

=== removed file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = \
-	dbdict		\
-	dbdih		\
-	dblqh		\
-	dbtup		\
-        backup          
-
-noinst_LIBRARIES = libblocks.a
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh \
-		@ZLIB_INCLUDES@
-libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp\
-  cmvmi/Cmvmi.cpp \
-  dbacc/DbaccInit.cpp dbacc/DbaccMain.cpp \
-  dbdict/Dbdict.cpp \
-  dbdih/DbdihInit.cpp dbdih/DbdihMain.cpp \
-  dblqh/DblqhInit.cpp dblqh/DblqhMain.cpp \
-  dbspj/DbspjInit.cpp dbspj/DbspjMain.cpp dbspj/DbspjProxy.cpp \
-  dbtc/DbtcInit.cpp dbtc/DbtcMain.cpp \
-  dbtup/DbtupExecQuery.cpp dbtup/DbtupBuffer.cpp \
-  dbtup/DbtupRoutines.cpp dbtup/DbtupCommit.cpp \
-  dbtup/DbtupFixAlloc.cpp dbtup/DbtupTrigger.cpp \
-  dbtup/DbtupAbort.cpp dbtup/DbtupPageMap.cpp \
-  dbtup/DbtupPagMan.cpp dbtup/DbtupStoredProcDef.cpp \
-  dbtup/DbtupMeta.cpp dbtup/DbtupTabDesMan.cpp \
-  dbtup/DbtupGen.cpp dbtup/DbtupIndex.cpp \
-  dbtup/DbtupDebug.cpp dbtup/DbtupScan.cpp \
-  dbtup/DbtupDiskAlloc.cpp dbtup/DbtupVarAlloc.cpp \
-  dbtup/tuppage.cpp dbtup/Undo_buffer.cpp \
-  ndbfs/AsyncIoThread.cpp \
-  ndbfs/PosixAsyncFile.cpp ndbfs/AsyncFile.cpp \
-  ndbfs/Ndbfs.cpp \
-  ndbfs/VoidFs.cpp \
-  ndbfs/Filename.cpp \
-  ndbcntr/NdbcntrInit.cpp ndbcntr/NdbcntrSysTable.cpp ndbcntr/NdbcntrMain.cpp \
-  qmgr/QmgrInit.cpp qmgr/QmgrMain.cpp \
-  trix/Trix.cpp \
-  backup/Backup.cpp backup/BackupInit.cpp \
-  dbutil/DbUtil.cpp \
-  suma/Suma.cpp suma/SumaInit.cpp \
-  dbtux/DbtuxGen.cpp dbtux/DbtuxMeta.cpp dbtux/DbtuxMaint.cpp \
-  dbtux/DbtuxNode.cpp dbtux/DbtuxTree.cpp dbtux/DbtuxScan.cpp \
-  dbtux/DbtuxSearch.cpp dbtux/DbtuxCmp.cpp dbtux/DbtuxStat.cpp \
-  dbtux/DbtuxDebug.cpp dbtux/DbtuxBuild.cpp \
-  LocalProxy.cpp \
-  dblqh/DblqhProxy.cpp \
-  dbacc/DbaccProxy.cpp \
-  dbtup/DbtupProxy.cpp \
-  dbtux/DbtuxProxy.cpp \
-  backup/BackupProxy.cpp \
-  RestoreProxy.cpp \
-  dbinfo/Dbinfo.cpp \
-  dblqh/DblqhCommon.cpp \
-  PgmanProxy.cpp \
-  dbtup/DbtupClient.cpp \
-  dbtc/DbtcProxy.cpp
-
-ndbtools_PROGRAMS = ndb_print_file
-ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
-ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/strings/libmystringslt.la
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-EXTRA_DIST = CMakeLists.txt    \
-	backup/CMakeLists.txt  \
-	dbdict/CMakeLists.txt  \
-	dbdih/CMakeLists.txt   \
-	dblqh/CMakeLists.txt   \
-	dbtup/CMakeLists.txt   \
-	ndbfs/Win32AsyncFile.cpp \
-	ndbfs/Win32AsyncFile.hpp
-

=== removed file 'storage/ndb/src/kernel/blocks/backup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-ndbtools_PROGRAMS = ndb_print_backup_file
-ndb_print_backup_file_SOURCES = read.cpp
-ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/common/util/libndbazio.la \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/strings/libmystringslt.la
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-

=== removed file 'storage/ndb/src/kernel/blocks/dbdict/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-LDADD +=  \
-         $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
-         $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/strings/libmystringslt.la
-
-ndbtools_PROGRAMS = ndb_print_schema_file
-ndb_print_schema_file_SOURCES = printSchemaFile.cpp
-ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/strings/libmystringslt.la
-

=== removed file 'storage/ndb/src/kernel/blocks/dbdih/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-ndbtools_PROGRAMS = ndb_print_sys_file
-ndb_print_sys_file_SOURCES = printSysfile.cpp
-ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/strings/libmystringslt.la
-
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-

=== removed file 'storage/ndb/src/kernel/blocks/dblqh/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-bin_PROGRAMS = ndbd_redo_log_reader
-
-ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \
-  redoLogReader/reader.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbuglt.la \
-         $(top_builddir)/mysys/libmysyslt.la \
-         $(top_builddir)/strings/libmystringslt.la
-

=== removed file 'storage/ndb/src/kernel/blocks/dbtup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-EXTRA_PROGRAMS = test_varpage
-test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
-test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la
-

=== removed file 'storage/ndb/src/kernel/error/Makefile.am'
--- a/storage/ndb/src/kernel/error/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/kernel/error/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LIBRARIES = liberror.a
-
-liberror_a_SOURCES = TimeModule.cpp \
-	ErrorReporter.cpp \
-	ndbd_exit_codes.c
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-

=== removed file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-noinst_LIBRARIES = libkernel.a libsched.a
-EXTRA_LIBRARIES= libsched_mt.a
-
-if BUILD_NDBMTD
-noinst_LIBRARIES += libsched_mt.a
-endif
-
-libkernel_a_SOURCES = VMSignal.cpp \
-                      Emulator.cpp \
-                      Configuration.cpp \
-                      WatchDog.cpp \
-                      SectionReader.cpp \
-                      Mutex.cpp \
-                      SafeCounter.cpp \
-                      Rope.cpp \
-                      ndbd_malloc.cpp \
-                      ndbd_malloc_impl.cpp \
-                      Pool.cpp \
-                      WOPool.cpp \
-                      RWPool.cpp \
-                      DynArr256.cpp \
-                      LockQueue.cpp \
-                      GlobalData.cpp \
-                      SafeMutex.cpp \
-                      Ndbinfo.cpp \
-                      NdbinfoTables.cpp \
-                      ArenaPool.cpp
-
-libsched_a_SOURCES = TimeQueue.cpp \
-                     ThreadConfig.cpp \
-                     FastScheduler.cpp \
-                     TransporterCallback_nonmt.cpp \
-                     SimulatedBlock_nonmt.cpp \
-                     LongSignal_nonmt.cpp \
-                     SimplePropertiesSection_nonmt.cpp \
-                     dummy_nonmt.cpp
-
-libsched_mt_a_SOURCES = SimulatedBlock_mt.cpp \
-                        TransporterCallback_mt.cpp \
-                        LongSignal_mt.cpp \
-                        SimplePropertiesSection_mt.cpp \
-                        mt.cpp \
-                        dummy_mt.cpp
-
-EXTRA_DIST=SimulatedBlock.cpp TransporterCallback.cpp CMakeLists.txt LongSignal.cpp SimplePropertiesSection.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
-
-LDADD_LOC = $(top_builddir)/storage/ndb/src/common/util/libgeneral.la
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-EXTRA_PROGRAMS = ndbd_malloc_impl_test bench_pool testDynArr256 \
-                 testSectionReader testLongSignals \
-		 testSafeMutex
-
-ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_TEST
-ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
-ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la
-
-bench_pool_SOURCES = bench_pool.cpp
-bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\
-  libkernel.a ../error/liberror.a \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la
-
-testDynArr256_CXXFLAGS = -DUNIT_TEST
-testDynArr256_SOURCES = DynArr256.cpp
-testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \
-  libkernel.a ../error/liberror.a \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la
-
-testSectionReader_CXXFLAGS = -DUNIT_TEST
-testSectionReader_SOURCES = SectionReader.cpp
-testSectionReader_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la
-
-testLongSignals_CXXFLAGS = -DUNIT_TEST
-testLongSignals_SOURCES = testLongSig/testLongSig.cpp
-testLongSignals_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la \
-  @readline_link@ @TERMCAP_LIB@
-
-testSafeMutex_CXXFLAGS = -DUNIT_TEST
-testSafeMutex_SOURCES = SafeMutex.cpp
-testSafeMutex_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/storage/ndb/src/libndbclient.la \
-  $(top_builddir)/mysys/libmysyslt.la \
-  $(top_builddir)/dbug/libdbuglt.la \
-  $(top_builddir)/strings/libmystringslt.la \
-  @readline_link@ @TERMCAP_LIB@
-
-

=== removed file 'storage/ndb/src/mgmapi/Makefile.am'
--- a/storage/ndb/src/mgmapi/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/mgmapi/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libmgmapi.la
-
-libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp ../kernel/error/ndbd_exit_codes.c ../mgmsrv/ConfigInfo.cpp \
-                       mgmapi_error.c
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi
-
-DEFS_LOC = -DNDB_MGMAPI
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-

=== removed file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LTLIBRARIES = libndbmgmclient.la
-ndbtools_PROGRAMS = ndb_mgm
-
-libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
-libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
-			    ../common/logger/liblogger.la \
-			    ../common/portlib/libportlib.la \
-			    ../common/util/libgeneral.la \
-			    ../common/portlib/libportlib.la \
-			    ../common/debugger/libtrace.la
-
-
-ndb_mgm_SOURCES = main.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-
-INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
-            -I$(top_srcdir)/storage/ndb/src/common/mgmcommon
-
-LDADD_LOC = $(noinst_LTLIBRARIES) \
-	    ../common/portlib/libportlib.la \
-            @readline_link@ \
-            $(top_builddir)/storage/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbuglt.la \
-            $(top_builddir)/mysys/libmysyslt.la \
-            $(top_builddir)/strings/libmystringslt.la \
-            @TERMCAP_LIB@ @NDB_SCI_LIBS@
-
-ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
-

=== removed file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-ndbbin_PROGRAMS = ndb_mgmd
-
-ndb_mgmd_SOURCES = \
-	MgmtSrvr.cpp \
-	main.cpp \
-	Services.cpp \
-	ConfigInfo.cpp \
-	InitConfigFileParser.cpp \
-	Config.cpp \
-	ConfigManager.cpp
-
-noinst_PROGRAMS = MgmConfig-t
-
-MgmConfig_t_SOURCES = \
-	testConfig.cpp \
-	InitConfigFileParser.cpp \
-	ConfigInfo.cpp \
-	Config.cpp
-MgmConfig_t_LDFLAGS = -static
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \
-               -I$(top_srcdir)/storage/ndb/src/mgmapi \
-               -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
-               -I$(top_srcdir)/storage/ndb/src/mgmclient
-
-LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
-            $(top_builddir)/storage/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbuglt.la \
-            $(top_builddir)/mysys/libmysyslt.la \
-            $(top_builddir)/strings/libmystringslt.la \
-            @readline_link@ \
-            @NDB_SCI_LIBS@ \
-	    @TERMCAP_LIB@
-
-# Define MYSQLCLUSTERDIR, the default location
-# of ndb_mgmd config files
-DEFS_LOC = -DMYSQLCLUSTERDIR="\"$(prefix)/mysql-cluster\""
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-
-ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
-

=== removed file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_PROGRAMS = ndberror_check-t
-
-ndberror_check_t_SOURCES = ndberror_check.cpp
-
-noinst_LTLIBRARIES = libndbapi.la
-
-libndbapi_la_SOURCES = \
-        NdbQueryBuilder.cpp     \
-        NdbQueryOperation.cpp   \
-        TransporterFacade.cpp   \
-        ClusterMgr.cpp  \
-        Ndb.cpp \
-        NdbPoolImpl.cpp \
-        NdbPool.cpp \
-        Ndblist.cpp     \
-        Ndbif.cpp       \
-        Ndbinit.cpp     \
-        Ndberr.cpp    \
-        ndberror.c    \
-        NdbErrorOut.cpp    \
-        NdbTransaction.cpp       \
-        NdbTransactionScan.cpp \
-        NdbOperation.cpp        \
-        NdbOperationSearch.cpp  \
-        NdbOperationScan.cpp    \
-        NdbOperationInt.cpp     \
-        NdbOperationDefine.cpp  \
-        NdbOperationExec.cpp    \
-        NdbScanOperation.cpp    \
-        NdbScanFilter.cpp       \
-        NdbIndexOperation.cpp   \
-        NdbEventOperation.cpp   \
-        NdbEventOperationImpl.cpp   \
-        NdbApiSignal.cpp        \
-        NdbRecAttr.cpp  \
-        NdbUtil.cpp \
-        NdbReceiver.cpp \
-        NdbDictionary.cpp \
-        NdbDictionaryImpl.cpp \
-        DictCache.cpp \
-        ndb_cluster_connection.cpp \
-	NdbBlob.cpp \
-	NdbIndexStat.cpp \
-	NdbIndexStatImpl.cpp \
-	NdbIndexStatFrmData.cpp \
-        SignalSender.cpp \
-        ObjectMap.cpp \
-	NdbInterpretedCode.cpp \
-	NdbInfo.cpp \
-	NdbInfoScanOperation.cpp \
-        ndb_internal.cpp \
-	trp_client.cpp \
-        trp_node.cpp \
-	trp_buffer.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-
-EXTRA_PROGRAMS = testSectionIterators
-
-testSectionIterators_CXXFLAGS = -DUNIT_TEST
-testSectionIterators_SOURCES = TransporterFacade.cpp
-testSectionIterators_LDFLAGS = @ndb_bin_am_ldflags@	 \
-  $(top_builddir)/storage/ndb/src/libndbclient.la

=== removed file 'storage/ndb/src/ndbjtie/Makefile.am'
--- a/storage/ndb/src/ndbjtie/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-## ----------------------------------------------------------------------
-
-## all subdirectories that have been configured (have a generated Makefile)
-DIST_SUBDIRS = jtie mysql . test
-
-## all subdirectories in DIST_SUBDIRS that should be built
-SUBDIRS = jtie mysql . test
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = README.txt utils \
-                $(MYSQL_DIR)/*.java \
-                $(MGMAPI_DIR)/*.java \
-                $(NDBAPI_DIR)/*.java \
-		MysqlUtilsWrapper.hpp \
-		NdbApiWrapper.hpp \
-                mysql_utils_jtie.hpp \
-                mgmapi_jtie.hpp \
-                ndbapi_jtie.hpp \
-                ndbjtie_defs.hpp \
-                CMakeLists.txt
-
-## ----------------------------------------------------------------------
-
-## list of jar files to install
-##   cannot use _LIBRARIES primary, which does not recognize .jar files;
-##   with _DATA, prefix dist_ is needed to add files to the distribution;
-##   with _DATA, prefix noinst_ seems not applicable.
-noinst_DATA = $(NDBJTIE_JAR)
-
-## dependencies
-JTIE_JAR = $(srcdir)/jtie/jtie-@JAVA_NDB_VERSION@.jar
-CLASSPATH_ENV = CLASSPATH=.:$(JTIE_JAR)
-
-JAVAROOT=$(srcdir)/target/classes
-JAVAHROOT=$(srcdir)/target
-
-## jar file to be created
-NDBJTIE_JAR = ndbjtie-@JAVA_NDB_VERSION@.jar
-
-## java top-level class files
-MYSQL_DIR = $(srcdir)/com/mysql/ndbjtie/mysql
-MYSQL_java = \
-		$(MYSQL_DIR)/Utils.java \
-		$(MYSQL_DIR)/CharsetMap.java \
-		$(MYSQL_DIR)/CharsetMapConst.java
-MGMAPI_DIR = $(srcdir)/com/mysql/ndbjtie/mgmapi
-MGMAPI_java = \
-		$(MGMAPI_DIR)/MGMAPI.java
-NDBAPI_DIR = $(srcdir)/com/mysql/ndbjtie/ndbapi
-NDBAPI_java = \
-		$(NDBAPI_DIR)/NDBAPI.java \
-		$(NDBAPI_DIR)/Ndb.java \
-		$(NDBAPI_DIR)/NdbBlob.java \
-		$(NDBAPI_DIR)/NdbBlobConst.java \
-		$(NDBAPI_DIR)/NdbConst.java \
-		$(NDBAPI_DIR)/NdbDictionary.java \
-		$(NDBAPI_DIR)/NdbError.java \
-		$(NDBAPI_DIR)/NdbErrorConst.java \
-		$(NDBAPI_DIR)/NdbEventOperation.java \
-		$(NDBAPI_DIR)/NdbEventOperationConst.java \
-		$(NDBAPI_DIR)/NdbIndexOperation.java \
-		$(NDBAPI_DIR)/NdbIndexOperationConst.java \
-		$(NDBAPI_DIR)/NdbIndexScanOperation.java \
-		$(NDBAPI_DIR)/NdbIndexScanOperationConst.java \
-		$(NDBAPI_DIR)/NdbInterpretedCode.java \
-		$(NDBAPI_DIR)/NdbLockHandle.java \
-		$(NDBAPI_DIR)/NdbLockHandleConst.java \
-		$(NDBAPI_DIR)/NdbOperation.java \
-		$(NDBAPI_DIR)/NdbOperationConst.java \
-		$(NDBAPI_DIR)/NdbRecAttr.java \
-		$(NDBAPI_DIR)/NdbRecAttrConst.java \
-		$(NDBAPI_DIR)/NdbRecord.java \
-		$(NDBAPI_DIR)/NdbRecordConst.java \
-		$(NDBAPI_DIR)/NdbScanFilter.java \
-		$(NDBAPI_DIR)/NdbScanFilterConst.java \
-		$(NDBAPI_DIR)/NdbScanOperation.java \
-		$(NDBAPI_DIR)/NdbScanOperationConst.java \
-		$(NDBAPI_DIR)/NdbTransaction.java \
-		$(NDBAPI_DIR)/NdbTransactionConst.java \
-		$(NDBAPI_DIR)/Ndb_cluster_connection.java \
-		$(NDBAPI_DIR)/Ndb_cluster_connectionConst.java
-
-classndbjtie.stamp: $(NDBAPI_java) $(MGMAPI_java) $(MYSQL_java)
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-	  $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-	fi
-	echo timestamp > classndbjtie.stamp
-
-$(NDBJTIE_JAR): classndbjtie.stamp 
-	rm -f $@; @JAR@ cvf $@  \
-	  -C $(srcdir)/jtie/target/classes com/mysql/jtie \
-	  -C $(JAVAROOT) com/mysql/ndbjtie
-
-## generate JNI header files (for development only)
-javah: $(NDBJTIE_JAR)
-	$(JAVAH) -classpath $(NDBJTIE_JAR) \
-		$(AM_JAVAHFLAGS) $(JAVAHFLAGS) \
-		-d $(JAVAHROOT) \
-		com.mysql.ndbjtie.mysql.Utils \
-		com.mysql.ndbjtie.mysql.CharsetMap \
-		com.mysql.ndbjtie.mgmapi.MGMAPI \
-		com.mysql.ndbjtie.ndbapi.NDBAPI \
-		com.mysql.ndbjtie.ndbapi.Ndb \
-		com.mysql.ndbjtie.ndbapi.NdbBlob \
-		com.mysql.ndbjtie.ndbapi.NdbDictionary \
-		com.mysql.ndbjtie.ndbapi.NdbError \
-		com.mysql.ndbjtie.ndbapi.NdbEventOperation \
-		com.mysql.ndbjtie.ndbapi.NdbIndexOperation \
-		com.mysql.ndbjtie.ndbapi.NdbIndexScanOperation \
-		com.mysql.ndbjtie.ndbapi.NdbInterpretedCode \
-		com.mysql.ndbjtie.ndbapi.NdbOperation \
-		com.mysql.ndbjtie.ndbapi.NdbRecAttr \
-		com.mysql.ndbjtie.ndbapi.NdbRecord \
-		com.mysql.ndbjtie.ndbapi.NdbScanFilter \
-		com.mysql.ndbjtie.ndbapi.NdbScanOperation \
-		com.mysql.ndbjtie.ndbapi.NdbTransaction \
-		com.mysql.ndbjtie.ndbapi.Ndb_cluster_connection
-
-## ----------------------------------------------------------------------
-
-## automake flags (overridden by per-target flags, added before user flags)
-AM_CPPFLAGS = \
-		-I./utils \
-		-I./jtie \
-		-I./mysql \
-		-I$(top_srcdir)/storage/ndb/include \
-		-I$(top_srcdir)/storage/ndb/include/mgmapi \
-		-I$(top_srcdir)/storage/ndb/include/ndbapi \
-		@JNI_INCLUDE_DIRS@
-
-## build a shared library
-noinst_LTLIBRARIES = libndbjtie.la
-
-## source files to build the library (added to distribuition by default)
-libndbjtie_la_SOURCES = ndbjtie_lib.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#libndbjtie_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-#libndbjtie_la_LIBADD = \
-#		../mysql/src/libmysqlutils.la \
-#		$(top_srcdir)/storage/ndb/src/libndbclient.la
-##   linking directly against a static (and not a libtool) library to ensure
-##   self-containment violates libtool conventions and triggers a warning
-##   about non-portability -- possibly, because of a potential pic/non-pic
-##   code mix on some platforms.
-#		../mysql/src/.libs/libmysqlutils.a \
-#		$(top_srcdir)/storage/ndb/src/.libs/libndbclient.a
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-#libndbjtie_la_LDFLAGS = -no-undefined ## build self-contained library
-#libndbjtie_la_LDFLAGS += -shared ## only create a shared library
-
-## generic libtool options (overrides AM_LIBTOOLFLAGS)
-#libndbjtie_la_LIBTOOLFLAGS =
-
-## ----------------------------------------------------------------------
-
-## cleanup
-MOSTLYCLEANFILES = 
-CLEANFILES = classndbjtie.stamp $(NDBJTIE_JAR)
-
-mostlyclean-local: 
-	rm -rf $(top_srcdir)/storage/ndb/src/ndbjtie/target
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/jtie/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-## ----------------------------------------------------------------------
-
-## all subdirectories that have been configured (have a generated Makefile)
-DIST_SUBDIRS = . test
-
-## all subdirectories in DIST_SUBDIRS that should be built
-SUBDIRS = . test
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = $(JTIE_DIR)/*.java \
-  CMakeLists.txt 
-
-## ----------------------------------------------------------------------
-
-## list of jar files to install
-##   cannot use _LIBRARIES primary, which does not recognize .jar files;
-##   with _DATA, prefix dist_ is needed to add files to the distribution;
-##   with _DATA, prefix noinst_ seems not applicable.
-noinst_DATA = $(JTIE_JAR)
-
-## dependencies
-CLASSPATH_ENV = CLASSPATH=.
-
-JAVAROOT=$(srcdir)/target/classes
-
-## jar file to be created
-JTIE_JAR = jtie-@JAVA_NDB_VERSION@.jar
-
-## java top-level class files
-JTIE_DIR = $(srcdir)/com/mysql/jtie
-JTIE_java = $(JTIE_DIR)/Wrapper.java \
-	$(JTIE_DIR)/ArrayWrapper.java
-
-classjtie.stamp: $(JTIE_java)
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-          echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-          $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-            $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-        fi
-	echo timestamp > classjtie.stamp
-
-$(JTIE_JAR): classjtie.stamp $(MANIFEST)
-	rm -f $@; @JAR@ cvf $@  \
-          -C $(JAVAROOT) com/mysql/jtie
-
-## generate JNI header files (for development only)
-javah: $(MYJAPI_CLASSES)
-	$(COMPILE.JAVAH) \
-		com.mysql.jtie.Wrapper
-		com.mysql.jtie.ArrayWrapper
-
-## ----------------------------------------------------------------------
-
-## cleanup lists
-MOSTLYCLEANFILES = $(JTIE_DIR)/*.class 
-CLEANFILES = classjtie.stamp $(JTIE_JAR)
-
-mostlyclean-local: 
-	rm -rf $(top_srcdir)/storage/ndb/src/ndbjtie/jtie/target
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/jtie/test/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-## all subdirectories that have been configured (have a generated Makefile)
-DIST_SUBDIRS = myapi myjapi unload
-
-## all subdirectories in DIST_SUBDIRS that should be built
-SUBDIRS =  myapi myjapi unload
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = jtie_unit_tests-t \
-	CMakeLists.txt
-
-## cleanup
-MOSTLYCLEANFILES = *.log

=== removed file 'storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-## ----------------------------------------------------------------------
-
-## automake flags (overridden by per-target flags, added before user flags)
-AM_CPPFLAGS = -I../../../utils -I$(top_srcdir)/storage/ndb/include
-
-## ----------------------------------------------------------------------
-
-## create the unit test scripts during build already
-all-local:	scripts
-
-## build a libtool convenience (i.e., non-installed) library
-##   prefixes check_, noinst_ result in no -rpath option being passed,
-##   which prevents libtool from creating a shared library.
-noinst_LTLIBRARIES = libmyapi.la
-#check_LTLIBRARIES = libmyapi.la
-
-## source files to build the library (added to the distribution by default)
-libmyapi_la_SOURCES = myapi.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#libmyapi_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-#libmyapi_la_LIBADD =
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-libmyapi_la_LDFLAGS = -no-undefined ## build self-contained library
-#libmyapi_la_LDFLAGS = -shared ## only create a shared library
-#libmyapi_la_LDFLAGS = -static ## only create a static library
-
-## generic libtool options (overrides AM_LIBTOOLFLAGS)
-#libmyapi_la_LIBTOOLFLAGS =
-
-## ----------------------------------------------------------------------
-
-## build a noninstalled test program
-noinst_PROGRAMS = myapi_test
-#check_PROGRAMS = myapi_test
-
-## source files to build the program (dist_ by default)
-myapi_test_SOURCES = myapi_test.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#myapi_test_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-myapi_test_LDADD = libmyapi.la
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-##   using -no-install requires shared libraries to be installed
-#myapi_test_LDFLAGS = -no-install ## never needs wrapper script
-myapi_test_LDFLAGS = -no-undefined ## build self-contained executable
-myapi_test_LDFLAGS += @ndb_cxx_runtime_libs@ ## need to link with C++ runtime
-#myapi_test_LDFLAGS += -static ## only create a static executable
-
-## ----------------------------------------------------------------------
-
-## programs or scripts to run for testing
-TESTS = $(UNIT_TESTS)
-TESTS_ENVIRONMENT = $(SHELL)
-#TESTS_ENVIRONMENT = $(SHELL) -x
-
-UNIT_TESTS = test_myapi.sh
-
-scripts:	$(UNIT_TESTS)
-
-test_myapi.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_myapi.log\"" >> $@
-	@ echo "test -f test_myapi.log && rm test_myapi.log" >> $@
-	@ echo "./myapi_test > test_myapi.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ----------------------------------------------------------------------
-
-EXTRA_DIST = myapi.hpp
-
-## cleanup
-MOSTLYCLEANFILES = *.log
-CLEANFILES = $(TESTS)
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-## ----------------------------------------------------------------------
-
-## create the unit test scripts during build already
-all-local:	scripts
-
-## list of jar files to install
-##   cannot use _LIBRARIES primary, which does not recognize .jar files;
-##   with _DATA, prefix dist_ is needed to add files to the distribution;
-##   with _DATA, prefix noinst_ seems not applicable.
-noinst_DATA = $(MYJAPI_JAR)
-
-## dependencies
-JTIE_JAR = $(top_srcdir)/storage/ndb/src/ndbjtie/jtie/jtie-@JAVA_NDB_VERSION@.jar
-CLASSPATH_ENV = CLASSPATH=.:$(JTIE_JAR)
-
-JAVAROOT=$(srcdir)/target/classes
-JAVAHROOT=$(srcdir)/target
-
-## jar file to be created
-MYJAPI_JAR = jtie-test-myjapi-@JAVA_NDB_VERSION@.jar
-
-## java top-level class files
-MYJAPI_DIR = $(srcdir)/myjapi
-MYJAPI_java = \
-		$(MYJAPI_DIR)/A.java \
-		$(MYJAPI_DIR)/B0.java \
-		$(MYJAPI_DIR)/B1.java \
-		$(MYJAPI_DIR)/CI.java \
-		$(MYJAPI_DIR)/D0.java \
-		$(MYJAPI_DIR)/D1.java \
-		$(MYJAPI_DIR)/D2.java \
-		$(MYJAPI_DIR)/E.java \
-		$(MYJAPI_DIR)/MyJapi.java \
-		$(MYJAPI_DIR)/MyJapiCtypes.java
-
-TEST_DIR = $(srcdir)/test
-TEST_java = \
-		$(TEST_DIR)/MyJapiTest.java
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = $(MYJAPI_DIR)/*.java  \
-		$(TEST_DIR)/*.java \
-		MyApiWrapper.hpp \
-		myjapi_MyJapi.hpp \
-		myjapi_MyJapiCtypes.hpp \
-		myjapi_classes.hpp \
-		CMakeLists.txt
-
-classmyjapi.stamp: $(MYJAPI_java) $(TEST_java)
-	mkdir -p $(JAVAROOT)
-	if test -n "$?"; then \
-          echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-          $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
-          $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
-        fi
-	echo timestamp > classmyjapi.stamp
-
-$(MYJAPI_JAR): classmyjapi.stamp
-	rm -f $@; @JAR@ cvf $@  \
-          -C $(top_srcdir)/storage/ndb/src/ndbjtie/jtie/target/classes com/mysql/jtie \
-          -C $(JAVAROOT) myjapi \
-          -C $(JAVAROOT) test
-
-## generate JNI header files (for development only)
-javah: $(MYJAPI_JAR)
-	$(JAVAH) -classpath $(MYJAPI_JAR) \
-		$(AM_JAVAHFLAGS) $(JAVAHFLAGS) \
-		-d $(JAVAHROOT) \
-		myjapi.A \
-		myjapi.B0 \
-		myjapi.B1 \
-		myjapi.CI \
-		myjapi.D0 \
-		myjapi.D1 \
-		myjapi.E \
-		myjapi.MyJapi \
-		myjapi.MyJapiCtypes
-
-## ----------------------------------------------------------------------
-
-## automake flags (overridden by per-target flags, added before user flags)
-AM_CPPFLAGS = \
-		-I$(top_srcdir)/storage/ndb/include \
-		-I../../../utils \
-		-I../.. \
-		-I../myapi \
-		@JNI_INCLUDE_DIRS@ \
-		-DJTIE_OBJECT_CLEAR_ADDRESS_UPON_DELETE
-
-## build a shared library for testing
-##   ideally, this library is not installed suggesting the use of prefixes
-##   check_ or noinst_; however, these prefixes result in no -rpath option
-##   is passed, which prevents libtool from creating a shared library; the
-##   argument to a manual -rpath option must be an absolute path, so, e.g.
-##   $(top_srcdir)/..., which resolves to a relative path, cannot be used;
-##   hence, we fall back on using the pkglib_ prefix and install the lib.
-pkglib_LTLIBRARIES = libmyjapi.la
-#noinst_LTLIBRARIES = libmyjapi.la
-#check_LTLIBRARIES = libmyjapi.la
-
-## source files to build the library (added to distribuition by default)
-libmyjapi_la_SOURCES = myjapi_lib.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#libmyjapi_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-libmyjapi_la_LIBADD = ../myapi/libmyapi.la
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-libmyjapi_la_LDFLAGS = -no-undefined ## build self-contained library
-libmyjapi_la_LDFLAGS += -shared ## only create a shared library
-libmyjapi_la_LDFLAGS += @ndb_cxx_runtime_libs@ ## need to link with C++ runtime
-## libmyjapi_la_LDFLAGS = -static ## only create a static library
-## libmyjapi_la_LDFLAGS = -rpath . ## only absolute run-paths are allowed
-
-## generic libtool options (overrides AM_LIBTOOLFLAGS)
-#libmyjapi_la_LIBTOOLFLAGS =
-
-## ----------------------------------------------------------------------
-
-## programs or scripts to run for testing
-TESTS = $(UNIT_TESTS)
-TESTS_ENVIRONMENT = $(SHELL)
-#TESTS_ENVIRONMENT = $(SHELL) -x
-
-UNIT_TESTS = test_myjapi.sh
-
-scripts:	$(UNIT_TESTS)
-
-# better enable asserts for these tests
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseParallelGC -XX:+UseParallelOldGC
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseSerialGC
-SUN_JAVAFLAGS = -ea -Xcheck:jni
-JAVAFLAGS_DEFAULT = $(SUN_JAVAFLAGS)
-JAVA_DEFAULT64 = java -d64
-JAVA_DEFAULT32 = java -d32
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-RUN_CLASSPATH = "$(MYJAPI_JAR)"
-JAVA_CLASSPATH = -classpath "\"$(RUN_CLASSPATH)\""
-JAVA_LIBPATH = -Djava.library.path="\"./.libs\""
-#JAVA_LIBPATH = -Djava.library.path="\"$(ndblibdir)\""
-
-test_myjapi.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_myjapi.log\"" >> $@
-	@ echo "test -f test_myjapi.log && rm test_myjapi.log" >> $@
-	if file .libs/myjapi_lib.o | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH) $(JAVA_CLASSPATH) \\" >> $@
-	@ echo "  test.MyJapiTest > test_myjapi.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ----------------------------------------------------------------------
-
-## cleanup
-MOSTLYCLEANFILES = *.log
-CLEANFILES = classmyjapi.stamp $(MYJAPI_JAR) $(TESTS)
-
-mostlyclean-local: 
-	rm -rf $(top_srcdir)/storage/ndb/src/ndbjtie/jtie/test/myjapi/target
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/jtie/test/unload/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-## ----------------------------------------------------------------------
-
-## create the unit test scripts during build already
-all-local:	scripts
-
-## list of jar files to install
-##   cannot use _LIBRARIES primary, which does not recognize .jar files;
-##   with _DATA, prefix dist_ is needed to add files to the distribution;
-##   with _DATA, prefix noinst_ seems not applicable.
-noinst_DATA = $(UNLOAD_TEST_JAR)
-
-## dependencies
-CLASSPATH += "."
-
-## jar file to be created
-UNLOAD_TEST_JAR = jtie-test-unload-@JAVA_NDB_VERSION@.jar
-$(UNLOAD_TEST_JAR):	$(TEST_CLASSES) $(TEST_DIR)
-	$(JAR) cvf $@ $(TEST_DIR)
-
-## java top-level class files
-TEST_DIR = $(srcdir)/test
-TEST_CLASSES = $(TEST_DIR)/MyLoadUnloadTest.class
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = $(TEST_DIR)/*.java CMakeLists.txt
-
-## ----------------------------------------------------------------------
-
-## programs or scripts to run for testing
-TESTS = $(UNIT_TESTS)
-TESTS_ENVIRONMENT = $(SHELL)
-#TESTS_ENVIRONMENT = $(SHELL) -x
-
-UNIT_TESTS = test_unload.sh
-
-scripts:	$(UNIT_TESTS)
-
-# better enable asserts for these tests
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseParallelGC -XX:+UseParallelOldGC
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseSerialGC
-SUN_JAVAFLAGS = -ea -Xcheck:jni
-JAVAFLAGS_DEFAULT = $(SUN_JAVAFLAGS)
-JAVA_DEFAULT64 = java -d64
-JAVA_DEFAULT32 = java -d32
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-MYJAPI = ../myjapi
-MYJAPI_JAR = "$(MYJAPI)/jtie-test-myjapi-@JAVA_NDB_VERSION@.jar"
-MYJAPI_O = "$(MYJAPI)/.libs/myjapi_lib.o"
-RUN_CLASSPATH = "$(UNLOAD_TEST_JAR):$(MYJAPI_JAR)"
-JAVA_CLASSPATH = -classpath "\"$(RUN_CLASSPATH)\""
-JAVA_LIBPATH = -Djava.library.path="\"$(MYJAPI)/.libs\""
-
-## myjapi unload test
-PROPERTIES = \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes="test.,myjapi." \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_class_name="test.MyJapiTest" \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_method_name="test"
-
-test_unload.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_unload.log\"" >> $@
-	@ echo "test -f test_unload.log && rm test_unload.log" >> $@
-	if file $(MYJAPI_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH) $(JAVA_CLASSPATH) \\" >> $@
-	@ echo "  $(PROPERTIES) \\" >> $@
-	@ echo "  test.MyLoadUnloadTest > test_unload.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ----------------------------------------------------------------------
-
-## cleanup
-MOSTLYCLEANFILES = $(TEST_DIR)/*.class *.log
-CLEANFILES = $(UNLOAD_TEST_JAR) $(TESTS)
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/mysql/Makefile.am'
--- a/storage/ndb/src/ndbjtie/mysql/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/mysql/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-# Copyright 2010 Sun Microsystems, Inc.
-# All rights reserved. Use is subject to license terms.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-## all subdirectories that have been configured (have a generated Makefile)
-DIST_SUBDIRS = test
-
-
-## ----------------------------------------------------------------------
-
-## automake flags (overridden by per-target flags, added before user flags)
-AM_CPPFLAGS = -I$(top_srcdir)/include \
-		-I$(top_srcdir)/storage/ndb/src/ndbjtie/utils \
-		-I$(top_srcdir)/storage/ndb/include \
-		-I$(top_srcdir)/storage/ndb/include/util \
-		-I$(top_srcdir)/storage/ndb/include/portlib
-
-## build a libtool convenience (i.e., non-installed) library
-##   prefixes check_, noinst_ result in no -rpath option being passed,
-##   which prevents libtool from creating a shared library.
-noinst_LTLIBRARIES = libmysqlutils.la
-
-## source files to build the library (added to the distribution by default)
-libmysqlutils_la_SOURCES = \
-		decimal_utils.cpp \
-		CharsetMap.cpp \
-		CharsetMapImpl.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#libmysqlutils_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-##   while unsatisfactory to include the headers from one lib but link
-##   against another one that happens to also define the symbols, we
-##   do not want to add another lib dependency here
-#libmysqlutils_la_LIBADD = $(top_srcdir)/libmysql/libmysqlclient.la
-#libmysqlutils_la_LIBADD = $(top_srcdir)/storage/ndb/src/libndbclient.la
-##   linking directly against a static (and not a libtool) library to ensure
-##   self-containment violates libtool conventions and triggers a warning
-##   about non-portability -- possibly, because of a potential pic/non-pic
-##   code mix on some platforms.
-#libmysqlutils_la_LIBADD = $(top_srcdir)/storage/ndb/src/.libs/libndbclient.a
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-#libmysqlutils_la_LDFLAGS = -no-undefined ## build self-contained library
-#libmysqlutils_la_LDFLAGS += -shared ## only create a shared library
-#libmysqlutils_la_LDFLAGS += -static ## only create a static library
-
-## generic libtool options (overrides AM_LIBTOOLFLAGS)
-#libmysqlutils_la_LIBTOOLFLAGS = -lstdc++
-
-## ----------------------------------------------------------------------
-
-EXTRA_DIST = CharsetMapImpl.h CMakeLists.txt
-
-## cleanup
-#MOSTLYCLEANFILES =
-#CLEANFILES =
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/mysql/test/Makefile.am'
--- a/storage/ndb/src/ndbjtie/mysql/test/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/mysql/test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-
-## ----------------------------------------------------------------------
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = mysql_utils_unit_tests-t
-
-## automake flags (overridden by per-target flags, added before user flags)
-AM_CPPFLAGS = -I$(top_srcdir)/storage/ndb/include -I.. \
-		-I$(top_srcdir)/storage/ndb/src/ndbjtie/utils
-
-
-## create the unit test scripts during build already
-all-local:	scripts
-
-## build a noninstalled test program
-noinst_PROGRAMS = mysql_utils_test
-#check_PROGRAMS = mysql_utils_test
-
-## source files to build the program (added to the distribution by default)
-mysql_utils_test_SOURCES = mysql_utils_test.cpp
-
-## per-target compilation flags (overrides the AM_ but not the user flags)
-#mysqlutils_test_CPPFLAGS = $(AM_CPPFLAGS)
-
-## extra libtool objects (.lo) or libtool libraries (.la)
-mysql_utils_test_LDADD = ../libmysqlutils.la ../../../libndbclient.la
-
-## mode-specific libtool options (overrides AM_LDFLAGS)
-##   using -no-install requires shared libraries to be installed
-mysql_utils_test_LDFLAGS = -no-undefined ## build self-contained executable
-#mysql_utils_test_LDFLAGS += -no-install ## never needs wrapper script
-#mysql_utils_test_LDFLAGS += -static ## only create a static executable
-
-## ----------------------------------------------------------------------
-
-## programs or scripts to run for testing
-TESTS = $(UNIT_TESTS)
-TESTS_ENVIRONMENT = $(SHELL)
-#TESTS_ENVIRONMENT = $(SHELL) -x
-
-UNIT_TESTS = test_mysql_utils.sh
-
-scripts:	$(UNIT_TESTS)
-
-test_mysql_utils.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_mysql_utils.log\"" >> $@
-	@ echo "test -f test_mysql_utils_test.log && rm test_mysql_utils.log" >> $@
-	@ echo "./mysql_utils_test > test_mysql_utils.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ----------------------------------------------------------------------
-
-## cleanup
-MOSTLYCLEANFILES = *.log
-CLEANFILES = $(TESTS)
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/src/ndbjtie/test/Makefile.am'
--- a/storage/ndb/src/ndbjtie/test/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,238 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/java_support.mk.am
-
-## ----------------------------------------------------------------------
-
-## files to be distributed and not covered in the automatic rules
-EXTRA_DIST = $(TEST_DIR)/*.java \
-	CMakeLists.txt \
-	ndbjtie_unit_tests-t
-
-NDBJTIE = ../
-
-## list of jar files to install
-##   cannot use _LIBRARIES primary, which does not recognize .jar files;
-##   with _DATA, prefix dist_ is needed to add files to the distribution;
-##   with _DATA, prefix noinst_ seems not applicable.
-noinst_DATA = $(NDBJTIE_TEST_JAR)
-
-## create the unit test scripts during build already
-all-local:	scripts
-
-## dependencies
-NDBJTIE_JAR = ../ndbjtie-@JAVA_NDB_VERSION@.jar
-MYJAPI = ../jtie/test/myjapi
-MYJAPI_JAR = "$(MYJAPI)/jtie-test-myjapi-@JAVA_NDB_VERSION@.jar"
-CLASSPATH += .:$(NDBJTIE_JAR):$(MYJAPI_JAR)
-
-## jar file to be created
-NDBJTIE_TEST_JAR = ndbjtie-test-@JAVA_NDB_VERSION@.jar
-$(NDBJTIE_TEST_JAR):	$(TEST_CLASSES) $(TEST_DIR)
-	$(JAR) cvf $@ $(TEST_DIR)
-
-## java top-level class files
-TEST_DIR = $(srcdir)/test
-TEST_CLASSES = \
-		$(TEST_DIR)/JTieTestBase.class \
-		$(TEST_DIR)/MySqlUtilsDecimalTest.class \
-		$(TEST_DIR)/MySqlUtilsCharsetMapTest.class \
-		$(TEST_DIR)/NdbJTieLibraryLoadingTest.class \
-		$(TEST_DIR)/NdbJTieSmokeTest.class
-
-## ----------------------------------------------------------------------
-
-## programs or scripts to run for testing
-# the ndbjtie smoke test requires a running cluster (for now)
-#TESTS = test_ndbjtie_smoke.sh test_unload_ndbjtie_smoke.sh
-# the mysql utils tests are just a library test
-TESTS = \
-	test_mutils_decimal.sh \
-	test_mutils_charsetmap.sh \
-	test_ndbjtie_library.sh \
-	test_unload_mutils_decimal.sh \
-	test_unload_mutils_charsetmap.sh \
-	test_unload_ndbjtie_library.sh
-TESTS_ENVIRONMENT = $(SHELL)
-#TESTS_ENVIRONMENT = $(SHELL) -x
-
-UNIT_TESTS = \
-	test_mutils_decimal.sh \
-	test_mutils_charsetmap.sh \
-	test_ndbjtie_library.sh \
-	test_ndbjtie_smoke.sh \
-	test_unload_mutils_decimal.sh \
-	test_unload_mutils_charsetmap.sh \
-	test_unload_ndbjtie_library.sh \
-	test_unload_ndbjtie_smoke.sh
-
-scripts:	$(UNIT_TESTS)
-
-# better enable asserts for these tests
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseParallelGC -XX:+UseParallelOldGC
-#SUN_JAVAFLAGS = -ea -Xcheck:jni -XX:+UseSerialGC
-SUN_JAVAFLAGS = -ea -Xcheck:jni
-JAVAFLAGS_DEFAULT = $(SUN_JAVAFLAGS)
-JAVA_DEFAULT64 = java -d64
-JAVA_DEFAULT32 = java -d32
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-NDBJTIE_O = "$(NDBJTIE)/.libs/ndbjtie_lib.o"
-RUN_CLASSPATH0 = "$(NDBJTIE_TEST_JAR):$(NDBJTIE_JAR)"
-JAVA_CLASSPATH0 = -classpath "\"$(RUN_CLASSPATH0)\""
-JAVA_LIBPATH0 = -Djava.library.path="\"../../.libs\""
-#JAVA_LIBPATH0 = -Djava.library.path="\"$(ndblibdir)\""
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-UNLOAD = ../jtie/test/unload
-UNLOAD_JAR = $(UNLOAD)/jtie-test-unload-@JAVA_NDB_VERSION@.jar
-RUN_CLASSPATH1 = "$(UNLOAD_JAR):$(RUN_CLASSPATH0)"
-JAVA_CLASSPATH1 = -classpath "\"$(RUN_CLASSPATH1)\""
-JAVA_LIBPATH1 = $(JAVA_LIBPATH0)
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-RUN_CLASSPATH2 = "$(NDBJTIE_TEST_JAR):$(MYJAPI_JAR):$(NDBJTIE_JAR)"
-JAVA_CLASSPATH2 = -classpath "\"$(RUN_CLASSPATH2)\""
-JAVA_LIBPATH2 = -Djava.library.path="\"$(MYJAPI)/.libs:../../.libs\""
-
-## dependencies
-# test uninstalled jars and libraries as a pre-install sanity test
-RUN_CLASSPATH3 = "$(UNLOAD_JAR):$(RUN_CLASSPATH2)"
-JAVA_CLASSPATH3 = -classpath "\"$(RUN_CLASSPATH3)\""
-JAVA_LIBPATH3 = $(JAVA_LIBPATH2)
-
-## mysql-utils decimal test
-test_mutils_decimal.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_mutils_decimal.log\"" >> $@
-	@ echo "test -f test_mutils_decimal.log && rm test_mutils_decimal.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH0) $(JAVA_CLASSPATH0) \\" >> $@
-	@ echo "  test.MySqlUtilsDecimalTest > test_mutils_decimal.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## mysql-utils charsetmap test
-test_mutils_charsetmap.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_mutils_charsetmap.log\"" >> $@
-	@ echo "test -f test_mutils_charsetmap.log && rm test_mutils_charsetmap.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH0) $(JAVA_CLASSPATH0) \\" >> $@
-	@ echo "  test.MySqlUtilsCharsetMapTest > test_mutils_charsetmap.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ndbjtie library test
-test_ndbjtie_library.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_ndbjtie_library.log\"" >> $@
-	@ echo "test -f test_ndbjtie_library.log && rm test_ndbjtie_library.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH2) $(JAVA_CLASSPATH2) \\" >> $@
-	@ echo "  test.NdbJTieLibraryLoadingTest > test_ndbjtie_library.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ndbjtie smoke test
-test_ndbjtie_smoke.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_ndbjtie_smoke.log\"" >> $@
-	@ echo "test -f test_ndbjtie_smoke.log && rm test_ndbjtie_smoke.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH0) $(JAVA_CLASSPATH0) \\" >> $@
-	@ echo "  test.NdbJTieSmokeTest > test_ndbjtie_smoke.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## mysql-utils decimal unload test
-MUTILS_DECIMAL_PROPERTIES = \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes="test.,com.mysql.ndbjtie." \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_class_name="test.MySqlUtilsDecimalTest" \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_method_name="test"
-
-test_unload_mutils_decimal.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_unload_mutils_decimal.log\"" >> $@
-	@ echo "test -f test_unload_mutils_decimal.log && rm test_unload_mutils_decimal.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH1) $(JAVA_CLASSPATH1) \\" >> $@
-	@ echo "  $(MUTILS_DECIMAL_PROPERTIES) \\" >> $@
-	@ echo "  test.MyLoadUnloadTest > test_unload_mutils_decimal.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## mysql-utils charsetmap unload test
-MUTILS_CHARSETMAP_PROPERTIES = \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes="test.,com.mysql.ndbjtie." \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_class_name="test.MySqlUtilsCharsetMapTest" \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_method_name="test"
-
-test_unload_mutils_charsetmap.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_unload_mutils_charsetmap.log\"" >> $@
-	@ echo "test -f test_unload_mutils_charsetmap.log && rm test_unload_mutils_charsetmap.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH1) $(JAVA_CLASSPATH1) \\" >> $@
-	@ echo "  $(MUTILS_CHARSETMAP_PROPERTIES) \\" >> $@
-	@ echo "  test.MyLoadUnloadTest > test_unload_mutils_charsetmap.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ndbjtie library unload test
-NDBJTIE_LIBRARY_TEST_PROPERTIES = \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes="test.,myjapi.,com.mysql.ndbjtie." \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_class_name="test.NdbJTieLibraryLoadingTest" \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_method_name="test"
-test_unload_ndbjtie_library.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_unload_ndbjtie_library.log\"" >> $@
-	@ echo "test -f test_unload_ndbjtie_library.log && rm test_unload_ndbjtie_library.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH3) $(JAVA_CLASSPATH3) \\" >> $@
-	@ echo "  $(NDBJTIE_LIBRARY_TEST_PROPERTIES) \\" >> $@
-	@ echo "  test.MyLoadUnloadTest > test_unload_ndbjtie_library.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ndbjtie smoke unload test
-NDBJTIE_PROPERTIES = \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes="test.,com.mysql.ndbjtie." \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_class_name="test.NdbJTieSmokeTest" \
-	-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_method_name="test"
-
-test_unload_ndbjtie_smoke.sh: Makefile
-	@ echo "#!/bin/sh" > $@
-	@ echo "echo \"for test output see file: test_unload_ndbjtie_smoke.log\"" >> $@
-	@ echo "test -f test_unload_ndbjtie_smoke.log && rm test_unload_ndbjtie_smoke.log" >> $@
-	if file $(NDBJTIE_O) | grep 64 > /dev/null 2>&1; then echo "$(JAVA_DEFAULT64) \\" >> $@; else echo "$(JAVA_DEFAULT32) \\" >> $@; fi
-	@ echo "  $(JAVAFLAGS_DEFAULT) \\" >> $@
-	@ echo "  $(JAVA_LIBPATH1) $(JAVA_CLASSPATH1) \\" >> $@
-	@ echo "  $(NDBJTIE_PROPERTIES) \\" >> $@
-	@ echo "  test.MyLoadUnloadTest > test_unload_ndbjtie_smoke.log 2>&1" >> $@
-	@CHMOD@ +x $@
-
-## ----------------------------------------------------------------------
-
-## cleanup
-MOSTLYCLEANFILES = $(TEST_DIR)/*.class *.log
-CLEANFILES = $(NDBJTIE_TEST_JAR) $(UNIT_TESTS)
-
-## ----------------------------------------------------------------------

=== removed file 'storage/ndb/test/Makefile.am'
--- a/storage/ndb/test/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = src tools ndbapi run-test
-
-EXTRA_DIST = include CMakeLists.txt
-

=== removed file 'storage/ndb/test/ndbapi/Makefile.am'
--- a/storage/ndb/test/ndbapi/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/test/ndbapi/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-SUBDIRS = bank
-EXTRA_DIST = CMakeLists.txt
-
-ndbtest_PROGRAMS = \
-testSpj \
-flexBench \
-drop_all_tabs \
-create_all_tabs \
-create_tab reorg_tab \
-flexAsynch \
-flexBench \
-flexHammer \
-flexTT \
-testBackup \
-testBasic \
-testBasicAsynch \
-testBlobs \
-testDataBuffers \
-testDict \
-testIndex \
-testLimits \
-testMgm \
-testMgmd \
-testSingleUserMode \
-testNativeDefault \
-testNdbApi \
-testNodeRestart \
-testUpgrade \
-testOIBasic \
-testOperations \
-testRestartGci \
-testScan \
-testInterpreter \
-testScanFilter \
-testScanInterpreter \
-testScanPerf \
-testSystemRestart \
-testTimeout \
-testTransactions \
-testDeadlock \
-test_event ndbapi_slow_select testReadPerf testLcp \
-testPartitioning \
-testBitfield \
-DbCreate DbAsyncGenerator \
-testSRBank \
-test_event_merge \
-testIndexStat \
-ndbapi_50compat0 \
-ndbapi_50compat1 \
-testNDBT \
-testReconnect \
-testNdbinfo \
-NdbRepStress \
-msa
-
-EXTRA_PROGRAMS = \
- test_event \
- test_event_merge \
- test_event_multi_table
-#flexTimedAsynch
-#testBlobs
-#flex_bench_mysql
-
-create_all_tabs_SOURCES = create_all_tabs.cpp
-create_tab_SOURCES = create_tab.cpp
-drop_all_tabs_SOURCES = drop_all_tabs.cpp
-flexAsynch_SOURCES = flexAsynch.cpp
-flexBench_SOURCES = flexBench.cpp
-flexHammer_SOURCES = flexHammer.cpp
-flexTT_SOURCES = flexTT.cpp
-#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
-#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
-testBackup_SOURCES = testBackup.cpp
-testBasic_SOURCES = testBasic.cpp
-testSpj_SOURCES = testSpj.cpp
-testBasicAsynch_SOURCES = testBasicAsynch.cpp
-testBlobs_SOURCES = testBlobs.cpp
-testDataBuffers_SOURCES = testDataBuffers.cpp
-testDict_SOURCES = testDict.cpp
-testIndex_SOURCES = testIndex.cpp
-testLimits_SOURCES = testLimits.cpp
-testMgm_SOURCES = testMgm.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/Config.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/ConfigInfo.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
-testMgm_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/include/debugger  
-testMgmd_SOURCES = testMgmd.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/Config.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/ConfigInfo.cpp \
-	$(top_srcdir)/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
-testMgmd_LDFLAGS = -static
-testMgmd_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/include/debugger  
-testSingleUserMode_SOURCES = testSingleUserMode.cpp
-testNativeDefault_SOURCES = testNativeDefault.cpp
-testNdbApi_SOURCES = testNdbApi.cpp
-testNodeRestart_SOURCES = testNodeRestart.cpp
-testUpgrade_SOURCES = testUpgrade.cpp
-testUpgrade_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
-testOIBasic_SOURCES = testOIBasic.cpp
-testOperations_SOURCES = testOperations.cpp
-testRestartGci_SOURCES = testRestartGci.cpp
-testScan_SOURCES = testScan.cpp ScanFunctions.hpp
-testInterpreter_SOURCES = testInterpreter.cpp
-testScanFilter_SOURCES = testScanFilter.cpp
-testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp 
-testScanPerf_SOURCES = testScanPerf.cpp
-testSystemRestart_SOURCES = testSystemRestart.cpp
-testTimeout_SOURCES = testTimeout.cpp
-testTransactions_SOURCES = testTransactions.cpp
-testDeadlock_SOURCES = testDeadlock.cpp
-test_event_SOURCES = test_event.cpp
-ndbapi_slow_select_SOURCES = slow_select.cpp
-testReadPerf_SOURCES = testReadPerf.cpp
-testLcp_SOURCES = testLcp.cpp
-testPartitioning_SOURCES = testPartitioning.cpp
-testNDBT_SOURCES = testNDBT.cpp
-testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
-testReconnect_SOURCES = testReconnect.cpp
-testReconnect_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
-testNdbinfo_SOURCES = testNdbinfo.cpp
-testBitfield_SOURCES = testBitfield.cpp
-NdbRepStress_SOURCES = acrt/NdbRepStress.cpp
-DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-testSRBank_SOURCES = testSRBank.cpp
-test_event_merge_SOURCES = test_event_merge.cpp
-test_event_multi_table_SOURCES = test_event_multi_table.cpp
-testIndexStat_SOURCES = testIndexStat.cpp
-reorg_tab_SOURCES = reorg_tab.cpp
-msa_SOURCES = msa.cpp
-
-ndbapi_50compat0_CPPFLAGS = -DNDBAPI_50_COMPAT
-ndbapi_50compat0_SOURCES = ndbapi_50compat0.cpp
-ndbapi_50compat0_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-
-ndbapi_50compat1_CPPFLAGS = -DNDBAPI_50_COMPAT
-ndbapi_50compat1_SOURCES = ndbapi_50compat1.cpp
-ndbapi_50compat1_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-
-testBackup_LDADD = $(LDADD) bank/libbank.a
-testSRBank_LDADD = bank/libbank.a $(LDADD) 
-NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
-

=== removed file 'storage/ndb/test/ndbapi/bank/Makefile.am'
--- a/storage/ndb/test/ndbapi/bank/Makefile.am	2011-02-04 09:45:35 +0000
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
-
-noinst_LIBRARIES = libbank.a
-
-libbank_a_SOURCES = Bank.cpp BankLoad.cpp Bank.hpp
-
-testBank_SOURCES = testBank.cpp
-bankSumAccounts_SOURCES = bankSumAccounts.cpp
-bankValidateAllGLs_SOURCES = bankValidateAllGLs.cpp 
-bankMakeGL_SOURCES = bankMakeGL.cpp 
-bankTransactionMaker_SOURCES = bankTransactionMaker.cpp 
-bankCreator_SOURCES = bankCreator.cpp  
-bankTimer_SOURCES = bankTimer.cpp
-
-LDADD_LOC = $(noinst_LIBRARIES)
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-

=== removed file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2011-04-26 09:41:12 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-testroot=$(prefix)
-testdir=$(testroot)/mysql-test/ndb
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
-
-test_PROGRAMS = atrt
-test_DATA=daily-basic-tests.txt daily-devel-tests.txt release-bigmem-tests.txt 16node-tests.txt \
-          conf-ndbmaster.cnf \
-          conf-fimafeng08.cnf conf-dl145a.cnf test-tests.txt conf-test.cnf \
-          conf-upgrade.cnf upgrade-tests.txt \
-	  conf-ndb07.cnf \
-	  conf-fimafeng09.cnf conf-tyr64.cnf conf-techra29.cnf \
-	  conf-blade08.cnf
-
-test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
-          autotest-run.sh atrt-backtrace.sh
-
-atrt_SOURCES = main.cpp setup.cpp files.cpp db.cpp command.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
-LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
-	    $(top_builddir)/storage/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbuglt.la \
-            $(top_builddir)/mysys/libmysyslt.la \
-            $(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@ \
-            $(top_builddir)/libmysql_r/libmysqlclient_r.la
-
-atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
-                      -I$(top_srcdir)/ndb/src/mgmsrv \
-                      -I$(top_srcdir)/ndb/include/mgmcommon \
-                 -DDEFAULT_PREFIX="\"$(prefix)\""
-
-atrt_LDFLAGS = -static @ndb_bin_am_ldflags@
-
-wrappersdir=$(prefix)/bin
-wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run atrt-mysqltest
-
-EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp CMakeLists.txt
-

=== removed file 'storage/ndb/test/src/Makefile.am'
--- a/storage/ndb/test/src/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/test/src/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_LIBRARIES = libNDBT.a
-
-libNDBT_a_SOURCES = \
-	NDBT_ReturnCodes.cpp \
-	NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
-	NDBT_Test.cpp HugoCalculator.cpp \
-	HugoOperations.cpp HugoTransactions.cpp \
-	HugoAsynchTransactions.cpp UtilTransactions.cpp \
-	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
-	NdbBackup.cpp  NdbConfig.cpp NDBT_Table.cpp \
-	NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c AtrtClient.cpp \
-	CpcClient.cpp NdbMixRestarter.cpp NDBT_Thread.cpp DbUtil.cpp \
-	SocketInputStream2.cpp NDBT_Find.cpp \
-	HugoQueryBuilder.cpp HugoQueries.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/storage/ndb/include/mgmcommon -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/include -I$(top_srcdir)/storage/ndb/include/debugger
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-

=== removed file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am	2011-06-23 06:59:40 +0000
+++ b/storage/ndb/test/tools/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt
-
-ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc listen_event eventlog rep_latency ndb_connect spj_sanity_test spj_performance_test test_spj hugoJoin
-
-hugoFill_SOURCES = hugoFill.cpp
-hugoLoad_SOURCES = hugoLoad.cpp
-hugoLockRecords_SOURCES = hugoLockRecords.cpp
-hugoPkDelete_SOURCES = hugoPkDelete.cpp
-hugoPkRead_SOURCES = hugoPkRead.cpp
-hugoPkReadRecord_SOURCES = hugoPkReadRecord.cpp
-hugoPkUpdate_SOURCES = hugoPkUpdate.cpp
-hugoScanRead_SOURCES = hugoScanRead.cpp
-hugoScanUpdate_SOURCES = hugoScanUpdate.cpp
-hugoJoin_SOURCES = hugoJoin.cpp
-
-restart_SOURCES = restart.cpp
-verify_index_SOURCES = verify_index.cpp
-copy_tab_SOURCES = copy_tab.cpp
-create_index_SOURCES = create_index.cpp
-ndb_cpcc_SOURCES = cpcc.cpp
-listen_event_SOURCES = listen.cpp
-eventlog_SOURCES = log_listner.cpp
-rep_latency_SOURCES = rep_latency.cpp
-ndb_connect_SOURCES = connect.cpp
-test_spj_SOURCES = test_spj.cpp
-test_spj_CXXFLAGS = -I$(top_srcdir)/storage/ndb/include/kernel \
-	-I$(top_srcdir)/storage/ndb/include/transporter \
-	-I$(top_srcdir)/storage/ndb/include/debugger \
-	-I$(top_srcdir)/storage/ndb/include/mgmapi \
-	-I$(top_srcdir)/storage/ndb/include/mgmcommon \
-        -I$(top_srcdir)/storage/ndb/include/ndbapi \
-        -I$(top_srcdir)/storage/ndb/include/util \
-	-I$(top_srcdir)/storage/ndb/include/portlib \
-	-I$(top_srcdir)/storage/ndb/include/logger
-
-spj_sanity_test_SOURCES = spj_sanity_test.cpp
-spj_sanity_test_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-spj_performance_test_SOURCES = spj_performance_test.cpp
-spj_performance_test_LDADD = $(LDADD) $(top_srcdir)/libmysql/libmysqlclient.la
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-
-ndb_cpcc_LDADD = $(LDADD)
-ndb_cpcc_LDFLAGS = -static
-

=== removed file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2011-06-22 08:09:31 +0000
+++ b/storage/ndb/tools/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-EXTRA_DIST = CMakeLists.txt ndbinfo.sql
-
-BUILT_SOURCES = ndbinfo.sql
-
-noinst_PROGRAMS = 	ndbinfo_sql ndb_dump_frm_data
-dist_bin_SCRIPTS =	ndb_size.pl ndb_error_reporter
-dist_pkgdata_DATA = ndbinfo.sql
-
-ndbtools_PROGRAMS = \
-  ndb_test_platform \
-  ndb_waiter \
-  ndb_drop_table \
-  ndb_delete_all \
-  ndb_desc \
-  ndb_drop_index \
-  ndb_show_tables \
-  ndb_select_all \
-  ndb_select_count \
-  ndb_restore ndb_config \
-  ndb_index_stat
-
-tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
-                       ../test/src/NDBT_Table.cpp \
-                       ../test/src/NDBT_Output.cpp
-
-ndb_test_platform_SOURCES = ndb_test_platform.cpp
-ndb_waiter_SOURCES = waiter.cpp $(tools_common_sources)
-ndb_delete_all_SOURCES = delete_all.cpp $(tools_common_sources)
-ndb_desc_SOURCES = desc.cpp $(tools_common_sources)
-ndb_drop_index_SOURCES = drop_index.cpp $(tools_common_sources)
-ndb_drop_table_SOURCES = drop_tab.cpp $(tools_common_sources)
-ndb_show_tables_SOURCES = listTables.cpp $(tools_common_sources)
-ndb_select_all_SOURCES = select_all.cpp \
-                         ../test/src/NDBT_ResultRow.cpp \
-                         $(tools_common_sources)
-ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)
-ndb_restore_SOURCES = restore/restore_main.cpp \
-                      restore/consumer.cpp \
-                      restore/consumer_restore.cpp \
-                      restore/consumer_printer.cpp \
-                      restore/Restore.cpp \
-                      ../test/src/NDBT_ResultRow.cpp $(tools_common_sources)
-
-ndb_config_SOURCES = ndb_config.cpp \
-	../src/mgmsrv/Config.cpp \
-	../src/mgmsrv/ConfigInfo.cpp \
-	../src/mgmsrv/InitConfigFileParser.cpp
-
-ndb_restore_LDADD = $(top_builddir)/storage/ndb/src/common/util/libndbazio.la \
-                    $(LDADD)
-
-
-ndbinfo_sql_SOURCES = ndbinfo_sql.cpp \
-	../src/mgmsrv/Config.cpp \
-	../src/mgmsrv/InitConfigFileParser.cpp
-
-ndbinfo_sql_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi
-
-# Build ndbinfo.sql by executing ndbinfo_sql
-ndbinfo.sql: $(ndbinfo_sql_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) ndbinfo_sql$(EXEEXT)
-	./ndbinfo_sql$(EXEEXT) > $@-t
-	$(MV) $@-t $@
-
-ndb_index_stat_SOURCES = ndb_index_stat.cpp $(tools_common_sources)
-ndb_dump_frm_data_SOURCES = ndb_dump_frm_data.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
-
-ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_drop_table_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_delete_all_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_desc_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_drop_index_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_config_LDFLAGS = @ndb_bin_am_ldflags@
-ndbinfo_sql_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_index_stat_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_dump_frm_data_LDFLAGS = @ndb_bin_am_ldflags@
-

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (jonas.oreland:3390 to 3391) Jonas Oreland29 Jun