MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:October 24 2009 6:46am
Subject:bzr commit into mysql-5.1-telco-6.3-ndbjtie branch (martin.zaun:3083)
View as plain text  
#At file:///Users/mz/mysql/ndb-6.3-ndbjtie-automake1/ based on revid:jdd@stripped2i4f2wxwwlv3ogok

 3083 Martin Zaun	2009-10-23
      ndbjtie - auto-toolized ndbjtie; see email for issues.

    removed:
      storage/ndb/ndbjtie/Makefile
      storage/ndb/ndbjtie/Makefile.defaults
      storage/ndb/ndbjtie/env.properties
      storage/ndb/ndbjtie/jtie/Makefile
      storage/ndb/ndbjtie/jtie/src/Makefile
      storage/ndb/ndbjtie/jtie/test/Makefile
      storage/ndb/ndbjtie/jtie/test/myapi/Makefile
      storage/ndb/ndbjtie/jtie/test/myjapi/Makefile
      storage/ndb/ndbjtie/mysql/Makefile
      storage/ndb/ndbjtie/mysql/src/Makefile
      storage/ndb/ndbjtie/mysql/test/Makefile
      storage/ndb/ndbjtie/ndbjtie/
      storage/ndb/ndbjtie/ndbjtie/Makefile
      storage/ndb/ndbjtie/ndbjtie/src/Makefile
      storage/ndb/ndbjtie/ndbjtie/test/Makefile
    added:
      storage/ndb/config/java_support.mk.am
      storage/ndb/ndbjtie/Makefile.am
      storage/ndb/ndbjtie/jtie/Makefile.am
      storage/ndb/ndbjtie/jtie/src/Makefile.am
      storage/ndb/ndbjtie/jtie/test/Makefile.am
      storage/ndb/ndbjtie/jtie/test/myapi/Makefile.am
      storage/ndb/ndbjtie/jtie/test/myjapi/Makefile.am
      storage/ndb/ndbjtie/mysql/Makefile.am
      storage/ndb/ndbjtie/mysql/src/Makefile.am
      storage/ndb/ndbjtie/mysql/test/Makefile.am
      storage/ndb/ndbjtie/src/Makefile.am
      storage/ndb/ndbjtie/test/Makefile.am
    renamed:
      storage/ndb/ndbjtie/ndbjtie/src/ => storage/ndb/ndbjtie/src/
      storage/ndb/ndbjtie/ndbjtie/test/ => storage/ndb/ndbjtie/test/
    modified:
      config/ac-macros/ha_ndbcluster.m4
      storage/ndb/Makefile.am
      storage/ndb/config/common.mk.am
      storage/ndb/ndbjtie/README.txt
      storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_A.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_B.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_CI.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_D.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.cpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_classes.cpp
      storage/ndb/ndbjtie/mysql/src/CharsetMap.cpp
      storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.cpp
      storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.h
      storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp
      storage/ndb/ndbjtie/src/mgmapi.cpp
      storage/ndb/ndbjtie/src/mysql.cpp
      storage/ndb/ndbjtie/src/ndbapi.cpp
      storage/ndb/ndbjtie/test/test/NdbJTieSmokeTest.java
      storage/ndb/ndbjtie/utils/helpers.hpp
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4	2009-06-22 14:09:28 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4	2009-10-24 06:46:29 +0000
@@ -20,69 +20,69 @@ AC_SUBST(MAKEINDEX)
 
 AC_DEFUN([MYSQL_CHECK_NDB_JTIE], [
 
-case "$host_os" in
-darwin*)        INC="Headers";;
-*)              INC="include";;
-esac
-
-dnl
-dnl Search for JAVA_HOME
-dnl
-
-for D in $JAVA_HOME $JDK_HOME /usr/lib/jvm/java /usr/lib64/jvm/java /usr/local/jdk /usr/local/java /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ; do
-        AC_CHECK_FILE([$D/$INC/jni.h],[found=yes])
-        if test X$found = Xyes
-        then
-                JINC=$D/$INC
-                break;
-        fi
-done
-
-if test -f "${JINC}/jni.h"
-then
-        JNI_INCLUDE_DIRS="-I${JINC}"
-else
-        AC_MSG_RESULT([-- Unable to locate jni.h!])
-fi
-
-dnl try to add extra include path
-case "$host_os" in
-bsdi*)    JNI_SUBDIRS="bsdos";;
-linux*)   JNI_SUBDIRS="linux genunix";;
-osf*)     JNI_SUBDIRS="alpha";;
-solaris*) JNI_SUBDIRS="solaris";;
-mingw*)   JNI_SUBDIRS="win32";;
-cygwin*)  JNI_SUBDIRS="win32";;
-*)        JNI_SUBDIRS="genunix";;
-esac
-
-dnl add any subdirectories that are present
-for S in ${JNI_SUBDIRS}
-do
-        if test -d "${JINC}/${S}"
-        then
-                JNI_INCLUDE_DIRS="${JNI_INCLUDE_DIRS} -I${JINC}/${S}"
-        fi
-done
-
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS ${JNI_INCLUDE_DIRS}"
-AC_CHECK_HEADERS(jni.h)
-CPPFLAGS="$CPPFLAGS_save"
-
-AC_CHECK_PROG(JAVAC, javac, javac, no)
-AC_CHECK_PROG(JAVAH, javah, javah, no)
-AC_CHECK_PROG(JAR, jar, jar, no)
-AC_SUBST(JNI_INCLUDE_DIRS)
-
-ndb_jtie_supported=no
-if test "$JAVAC" &&
-   test "$JAVAH" &&
-   test "$JAR" &&
-   test X"$ac_cv_header_jni_h" = Xyes
-then
-        ndb_jtie_supported=yes
-fi
+  case "$host_os" in
+  darwin*)        INC="Headers";;
+  *)              INC="include";;
+  esac
+
+  dnl
+  dnl Search for JAVA_HOME
+  dnl
+
+  for D in $JAVA_HOME $JDK_HOME /usr/lib/jvm/java /usr/lib64/jvm/java /usr/local/jdk /usr/local/java /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ; do
+          AC_CHECK_FILE([$D/$INC/jni.h],[found=yes])
+          if test X$found = Xyes
+          then
+                  JINC=$D/$INC
+                  break;
+          fi
+  done
+
+  if test -f "${JINC}/jni.h"
+  then
+          JNI_INCLUDE_DIRS="-I${JINC}"
+  else
+          AC_MSG_RESULT([-- Unable to locate jni.h!])
+  fi
+
+  dnl try to add extra include path
+  case "$host_os" in
+  bsdi*)    JNI_SUBDIRS="bsdos";;
+  linux*)   JNI_SUBDIRS="linux genunix";;
+  osf*)     JNI_SUBDIRS="alpha";;
+  solaris*) JNI_SUBDIRS="solaris";;
+  mingw*)   JNI_SUBDIRS="win32";;
+  cygwin*)  JNI_SUBDIRS="win32";;
+  *)        JNI_SUBDIRS="genunix";;
+  esac
+
+  dnl add any subdirectories that are present
+  for S in ${JNI_SUBDIRS}
+  do
+          if test -d "${JINC}/${S}"
+          then
+                  JNI_INCLUDE_DIRS="${JNI_INCLUDE_DIRS} -I${JINC}/${S}"
+          fi
+  done
+
+  CPPFLAGS_save="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS ${JNI_INCLUDE_DIRS}"
+  AC_CHECK_HEADERS(jni.h)
+  CPPFLAGS="$CPPFLAGS_save"
+
+  AC_CHECK_PROG(JAVAC, javac, javac, no)
+  AC_CHECK_PROG(JAVAH, javah, javah, no)
+  AC_CHECK_PROG(JAR, jar, jar, no)
+  AC_SUBST(JNI_INCLUDE_DIRS)
+
+  ndb_jtie_supported=no
+  if test "$JAVAC" &&
+     test "$JAVAH" &&
+     test "$JAR" &&
+     test X"$ac_cv_header_jni_h" = Xyes
+  then
+          ndb_jtie_supported=yes
+  fi
 ])
 
 AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
@@ -243,6 +243,9 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   AC_MSG_RESULT([done.])
 ])
 
+# XXX hack for ndbjtie, needs to be fixed & cleaned up
+AM_CONDITIONAL([NDBJTIE_GCC_WORKAROUNDS], [test "$GCC" = "yes"])
+
 AC_DEFUN([NDBCLUSTER_WORKAROUNDS], [
 
   #workaround for Sun Forte/x86 see BUG#4681
@@ -375,6 +378,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   if test X"$have_ndb_jtie" = Xyes
   then
     ndb_opt_subdirs="$ndb_opt_subdirs ndbjtie"
+    # MMM ndb_opt_subdirs="$ndb_opt_subdirs ndbjtie ndbjtie/jtie ndbjtie/mysql ndbjtie/ndbjtie"
   fi
 
   # building dynamic breaks on AIX. (If you want to try it and get unresolved

=== modified file 'storage/ndb/Makefile.am'
--- a/storage/ndb/Makefile.am	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/Makefile.am	2009-10-24 06:46:29 +0000
@@ -14,8 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+# XXX remove swig
 SUBDIRS = src tools . include swig @ndb_opt_subdirs@
-DIST_SUBDIRS = src tools include test docs swig
+DIST_SUBDIRS = src tools include test docs swig @ndb_opt_subdirs@
 EXTRA_DIST = config ndbapi-examples plug.in
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 

=== modified file 'storage/ndb/config/common.mk.am'
--- a/storage/ndb/config/common.mk.am	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/config/common.mk.am	2009-10-24 06:46:29 +0000
@@ -18,6 +18,8 @@ ndbbindir        = "$(libexecdir)"
 ndbtoolsdir      = "$(bindir)"
 ndbtestdir       = "$(bindir)"
 ndblibdir        = "$(pkglibdir)"
+ndbjardir        = "$(pkgdatadir)/java"
+# XXX remove swig
 swigincludedir   = "$(datadir)/mysql/swig"
 ndbincludedir    = "$(pkgincludedir)/storage/ndb"
 ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"

=== added file 'storage/ndb/config/java_support.mk.am'
--- a/storage/ndb/config/java_support.mk.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/java_support.mk.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,70 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+## This file provides basic build support for Java
+
+## The built-in Java support offered by Automake is rudimentary and has
+## shortcomings making it unusable for standard Java development purposes.
+##
+## The _JAVA primary provides for rules generating .class targets but:
+## - apparently, does not recognize the noinst_ prefix
+## - tries to install .class files
+## - expects .class files in '.' ("*.class: No such file or directory"),
+##   which breaks with basic Java conventions and build tools (IDEs)
+## - stamp-based, single touched source file recompiles all
+##
+## For consistency, we do not use any of the pre-defined variables (@...@):
+## JAVAROOT -- passed to the `-d' option to javac (default: `$(top_builddir)')
+## JAVAC -- the name of the Java compiler (default: `javac')
+## JAVACFLAGS -- user variable, the flags to pass to the compiler
+## AM_JAVACFLAGS -- more flags to pass to the Java compiler
+## CLASSPATH_ENV -- an sh expression used to set the CLASSPATH environment
+## (In the future we will probably handle class path setting differently.) 
+
+## Since the Java build process is quite simple (and mostly vendor-neutral),
+## the subsequent variables and rules are sufficient and better suited than
+## automake's built-in support for building Java in subprojects.
+
+## provide an empty default, append in subprojects by +=
+CLASSPATH =
+
+JAVAC = javac
+JAVACFLAGS = -g
+
+JAVAH = javah
+JAVAHFLAGS = -jni -force
+
+JAVA = java
+JAVAFLAGS =
+
+JAR = jar
+
+COMPILE.JAVA = $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH)
+
+COMPILE.JAVAH = $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH)
+
+## probably redundant
+SUFFIXES = .java .class
+
+## compile a Java source
+##   while gnu make's pattern rules would be more general and clearer
+## %.class: %.java
+##   portable make rules can only use the old double-suffix syntax
+.java.class:
+	$(COMPILE.JAVA) $<
+
+## ----------------------------------------------------------------------

=== removed file 'storage/ndb/ndbjtie/Makefile'
--- a/storage/ndb/ndbjtie/Makefile	2009-10-09 20:15:02 +0000
+++ b/storage/ndb/ndbjtie/Makefile	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#------------------------------------------------------------------------------
-
-.PHONY:	all help dep dbg opt prf clean mostlyclean distclean check
-all:	dbg
-
-help:
-	@echo "dep		-- build dependencies"
-	@echo "all		-- build all targets with default flags"
-	@echo "dbg		-- build all targets with debug flags"
-	@echo "opt		-- build all targets with optimizing flags"
-	@echo "prf		-- build all targets with profiling flags"
-	@echo "clean		-- delete temporary files"
-	@echo "mostlyclean	-- also delete all generated files"
-	@echo "distclean	-- also delete backup files"
-	@echo "check		-- perform self-tests (if any)"
-
-dep dbg opt prf clean mostlyclean distclean check:
-	@cd mysql && $(MAKE) $(MFLAGS) $@
-	@cd jtie && $(MAKE) $(MFLAGS) $@
-	@cd ndbjtie && $(MAKE) $(MFLAGS) $@
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/Makefile.am'
--- a/storage/ndb/ndbjtie/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 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
+
+## all subdirectories that have been configured (have a generated Makefile)
+DIST_SUBDIRS = jtie mysql src test
+
+## all subdirectories in DIST_SUBDIRS that should be built
+SUBDIRS = jtie mysql src test
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = README.txt utils

=== removed file 'storage/ndb/ndbjtie/Makefile.defaults'
--- a/storage/ndb/ndbjtie/Makefile.defaults	2009-10-15 21:27:09 +0000
+++ b/storage/ndb/ndbjtie/Makefile.defaults	1970-01-01 00:00:00 +0000
@@ -1,377 +0,0 @@
-#------------------------------------------------------------------------------
-
-# Default Variables Section:
-
-# to avoid problems where SHELL is inherited from the environment
-  SHELL = /bin/sh
-
-######	Target:
-  TARGET_ARCH	= -fPIC
-
-######	C Preprocessor:
-#  CPP		= cpp
-  CPP		= $(CC) -E
-  CPPFLAGS	= $(DDEFINES) $(INCLUDES)
-
-# gnu ccp:
-# -M Generates make dependencies.
-# -MM Similar to -M, but ignores system header files.
-# -MD Similar to -M, but puts output in a .d file.
-# -MMD Similar to -MD, but ignores system header files.
-# -MG Treats missing header files as generated files.
-  MAKEDEPEND	= $(CPP) -MM $(CPPFLAGS)
-#  MAKEDEPEND	= makedepend
-
-######	C Compiler:
-
-  CC	   	= gcc
-# plain cc, debug:
-#  CFLAGS	= -g -DDEBUG
-# gnu gcc, general: -pedantic -ansi -std=c89 -std=c99 -std=gnu89 -std=gnu99
-  CFLAGS.gen	= -Wall
-# gnu gcc, default:
-  CFLAGS	= $(CFLAGS.gen) -g -O
-# gnu gcc, debug:
-  CFLAGS.dbg	= $(CFLAGS.gen) -g -DDEBUG
-# gnu gcc, optimize: -funroll-all-loops -fomit-frame-pointer
-  CFLAGS.opt 	= $(CFLAGS.gen) -DNDEBUG -O3
-# gnu gcc, profile:
-  CFLAGS.prf 	= $(CFLAGS.opt) -pg
-
-#  CC	   	= cc
-# Sun cc, debug:
-#  CFLAGS	= -g -v -Xc -DDEBUG
-# Sun cc, optimize:
-#  CFLAGS	= -fast -xO4 -Xc -DNDEBUG
-
-######	C++ Compiler:
-
-  CXX  		= g++
-# gnu g++, general: -pedantic -ansi -std=c++98 -std=gnu++98
-#   -fabi-version=2 -fabi-version=1 -fabi-version=0
-#   -fno-implicit-templates -fno-implicit-inline-templates -frepo
-#   -Weffc++
-#      Unfortunately, -Weffc++ issues broad warnings that cannot be
-#      individually suppressed by -Wno-... (e.g. -Wno-non-virtual-dtor);
-#      therefore, we generally leave out -Weffc++
-#   -Wold-style-cast
-#   -Woverloaded-virtual
-#      Unfortunately, too many warnings from NDB includes
-  CXXFLAGS.gen	= -ansi -Wall -Wstrict-null-sentinel \
-		  -Wsign-promo
-# gnu g++, default:
-  CXXFLAGS	= $(CXXFLAGS.gen) -g -O
-  CXXFLAGS.dbg	= $(CXXFLAGS.gen) -g -DDEBUG
-# gnu g++, optimize: -fomit-frame-pointer
-  CXXFLAGS.opt 	= $(CXXFLAGS.gen) -O3 -DNDEBUG
-# gnu g++, profile:
-  CXXFLAGS.prf 	= $(CXXFLAGS.opt) -pg
-
-#  CXX  	= CC
-# Sun CC, debug: not used: -ptv, particularly -pta !
-#  CXXFLAGS 	= -g +d +w +p -DDEBUG
-# Sun CC, optimize:
-#  CXXFLAGS 	=  -fast -O4 -DNDEBUG
-
-######	Java Compiler:
-
-  JAVAC  	= javac
-  JAVACFLAGS  	= 
-
-  JAVAH  	= javah
-  JAVAHFLAGS  	= -jni -force
-
-  JAVA  	= java
-  JAVAFLAGS  	=
-
-  JAR		= jar
-  JARFLAGS  	=
-
-######	Linker:
-#  LD		= ld
-  LD		= $(CC)
-#  LD		= $(CXX)
-# gnu ld, general:
-  LDFLAGS.gen	=
-# gnu ld, default:
-  LDFLAGS	= $(LDFLAGS.gen)
-# gnu ld, debug:
-  LDFLAGS.dbg	= $(LDFLAGS.gen)
-# gnu ld, optimize: -s
-  LDFLAGS.opt	= $(LDFLAGS.gen)
-# gnu ld, profile: -S
-  LDFLAGS.prf	= $(LDFLAGS.gen)
-
-######	Library-Archiver:
-  AR		= ar
-  ARFLAGS	= rv
-#  ARFLAGS	= rvu
-#  RANLIB	= ranlib
-
-# r	insert the files member... into archive (with replacement)
-# u	only insert those files newer than existing members of the same names
-# v	request the verbose version of an operation
-
-# ranlib updates '__.SYMDEF' member (directory of the external symbol names)
-# not needed with GNU ar, which updates the `__.SYMDEF' member automatically
-
-#------------------------------------------------------------------------------
-
-# Default Targets Section:
-
-.PHONY:	dep depend dbg opt prf clean mostlyclean distclean check
-
-dep depend:
-	@set -e; \
-	rm -f .depend .depend$$$$ ; touch _dummy.c _dummy.cc _dummy.cpp; \
-	$(MAKEDEPEND) *.c *.cc *.cpp > .depend.$$$$; \
-	rm -f _dummy.c _dummy.cc _dummy.cpp; mv .depend.$$$$ .depend
-
-# other options:
-#	$(CXX) -E -MM $(CPPFLAGS) *.cpp > .tmp
-
-dbg:
-	@$(MAKE) $(MFLAGS) \
-		CFLAGS='$(CFLAGS.dbg)' \
-		CXXFLAGS='$(CXXFLAGS.dbg)' \
-		LDFLAGS='$(LDFLAGS.dbg)' \
-		all
-opt:
-	@$(MAKE) $(MFLAGS) \
-		CFLAGS='$(CFLAGS.opt)' \
-		CXXFLAGS='$(CXXFLAGS.opt)' \
-		LDFLAGS='$(LDFLAGS.opt)' \
-		all
-
-prf:
-	@$(MAKE) $(MFLAGS) \
-		CFLAGS='$(CFLAGS.prf)' \
-		CXXFLAGS='$(CXXFLAGS.prf)' \
-		LDFLAGS='$(LDFLAGS.prf)' \
-		all
-
-clean:
-	rm -rf $(CLEAN) .tmp
-
-# library-archiving removes .o files with empty .depend file,
-# so, better delete it only as part of mostlyclean
-mostlyclean:	clean
-	rm -rf $(MOSTLYCLEAN) .depend
-
-distclean:	mostlyclean
-	rm -rf $(DISTCLEAN)
-
-#------------------------------------------------------------------------------
-
-# Default Rules Section:
-
-# for Solaris make compatibility check:
-#   http://www.ibm.com/developerworks/eserver/articles/porting_linux/
-
-# good idea to clear&set the suffix list explicitly with only the ones needed
-.SUFFIXES:
-.SUFFIXES: .h .c .cc .cpp .o .a .so .dylib
-
-# use "$<" and "$@", not hardcoded names for `VPATH' to work correctly
-
-# better not use single- or double-suffix rules, for:
-#	".c.o:" == "%.o: %.c"
-#	".c"	== "% : %.c"
-# but:	".c.o: foo.h" != "%.o: %.c foo.h"
-
-######	Generate Dependencies:
-  ADD_D_TARGET	= sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g'
-
-  GENERATE.c	= @set -e; rm -f $@; \
-		$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< | \
-		$(ADD_D_TARGET) > $@
-
-  GENERATE.cc	= @set -e; rm -f $@; \
-		$(CXX) -MM $(CXXFLAGS) $(CPPFLAGS) $< | \
-		$(ADD_D_TARGET) > $@
-
-  GENERATE.cpp	= $(GENERATE.cc)
-
-%.d: %.c
-	$(GENERATE.c)
-
-%.d: %.cc
-	$(GENERATE.cc)
-
-%.d: %.cpp
-	$(GENERATE.cpp)
-
-######	Compile:
-  COMPILE.c	= $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-
-  COMPILE.cc	= $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-
-  COMPILE.cpp	= $(COMPILE.cc)
-
-  OUTPUT_OPTION	= -o $@
-
-  COMPILE.java	= $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH)
-
-  COMPILE.javah	= $(JAVAH) $(JAVAHFLAGS) -classpath $(CLASSPATH)
-
-%.o: %.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-%.o: %.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-%.o: %.cpp
-	$(COMPILE.cpp) $(OUTPUT_OPTION) $<
-
-%.class: %.java
-	$(COMPILE.java) $<
-
-######	Link:
-  LINK.c	= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH)
-
-  LINK.cc	= $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH)
-
-  LINK.cpp	= $(LINK.cc)
-
-  LINK.o	= $(CC) $(LDFLAGS) $(TARGET_ARCH)
-
-  DLL_SUFFIX	= $(if $(findstring Darwin,$(shell uname)),dylib,so)
-
-%: %.c
-	$(LINK.c) $^ $(LDLIBS) -o $@
-
-%: %.cc
-	$(LINK.cc) $^ $(LDLIBS) -o $@
-
-%: %.cpp
-	$(LINK.cpp) $^ $(LDLIBS) -o $@
-
-%: %.o
-	$(LINK.o) $^ $(LDLIBS) -o $@
-
-%.so:
-	$(LINK.cpp) -shared $+ $(LDLIBS) -o $@
-
-%.dylib:
-	$(LINK.cpp) -dynamiclib $+ $(LDLIBS) -o $@
-
-# -llibrary
-# It makes a difference where in the command you write this option; the
-# linker searches and processes libraries and object files in the order they
-# are specified.  Thus, foo.o -lz bar.o searches library z after file foo.o
-# but before bar.o.  If bar.o refers to functions in z, those functions may
-# not be loaded.
-#
-# The directories searched include several standard system directories plus
-# any that you specify with -L.
-#
-# The linker handles an archive file by scanning through it for members which
-# define symbols that have so far been referenced but not defined.
-#
-# But if the file that is found is an ordinary object file, it is linked in
-# the usual fashion.
-#
-# The only difference between using an -l option and specifying a file name
-# is that -l surrounds library with lib and .a and searches several
-# directories -- NOT QUITE: on some systems (Solaris, MacOSX), if present,
-# the .so is used for linking and not the .a.
-
-# -fpic -fPIC
-#
-# Mac OS X: -fpic is not supported, -fPIC is the default
-# SPARC, m68k, PowerPC: -fpic has size limits but faster (?) than -fPIC
-# 386: -fpic (if supported) same (?) performance as -fPIC
-# 
-# to build shared libraries with -fast, specify -fPIC at compilation
-# MacOS X: cannot use -fast, not supported
-
-# -Bdynamic, -dy, -call_shared
-# link against dynamic libraries.
-#
-# -Bstatic, -dn, -non_shared, -static
-# do not link against shared libraries; can be used with -shared;
-# means that a shared library is being created but that all of the
-# libraryng in
-# entries from static libraries.
-#
-# -shared, -Bshareable
-# create a shared library. On SunOS, the linker will automatically
-# create a shared library if the -e option is not used and there are
-# undefined symbols in the link.
-#
-# For predictable results, you must also specify the same set of options
-# that were used to generate code (-fpic, -fPIC, or model suboptions)
-# when you specify this option.
-#
-# can link some libraries statically and others dynamically:
-#  gcc -o some-program some-program.c -Xlinker
-#      -Bstatic -llib1 -lib2 -Xlinker -Bdynamic -llib3
-
-# to check the dynamic load library: use ldd to invoke executables, which
-# dumps their library dependencies
-#
-# by default (Linux) only /lib and /usr/lib are searched for shared libs;
-# can use -W1, -rpath option when linking or set the LD_LIBRARY_PATH
-# environment variable when running the program
-#
-# undefined references to be resolved by LD_LIBRARY_PATH:
-#         libmyapi.so
-#   or
-#         -L. -lmyapi
-#
-#   ldd libmyjapi.so
-#         libmyapi.so => not found
-#
-# symbolical references with default library path:
-#         -Wl,-rpath -Wl,/home/md/martins_little_helpers/src/myapi
-#
-#   ldd libmyjapi.so
-#          libmyapi.so => /home/md/martins_little_helpers/src/myapi/libmyapi.so (0xb7f8d000)
-#
-#         -Wl,-rpath -Wl,.
-#
-#   ldd libmyjapi.so
-#          libmyapi.so => ./libmyapi.so (0xb7edd000)
-#
-# doesn't seem to have an effect:
-#	-Wl,-rpath -Wl,".:$(MYAPI)" $(MYAPI)/libmyapi.dylib
-#
-# statically linked references:
-#         libmyapi.a
-#   ldd libmyjapi.so
-
-# examples, link a shared library:
-#
-#%.dylib:
-#	libtool -dynamic -undefined dynamic_lookup -o $@ yyy.o ...
-#
-#%.so:
-#	$(LINK.cpp) -shared -o $@ yyy.o ... VERSION
-#
-#  gcc -I/usr/local/java/include -I/usr/local/java/include/genunix -fPIC -c Happy.c HappyImp.c
-#  gcc -shared -Wl,-soname,libhappy.so.1 -o libhappy.so.1.0 Happy.o HappyImp.o
-#
-# could be that .so is/works the same on MacOS X
-
-######	Library-Archive:
-
-# general form
-# lib.a: $(OBJ)
-#        $(AR) rvu $@ $<
-#        $(RANLIB) $@
-
-# gnu make has special support for lib(o) targets; this rule
-# (%): %
-#	$(AR) $(ARFLAGS) $@ $<
-# allows to specify lib targets simply as:
-# lib.a: lib.a(a.o b.o ...) lib.a(c.o)...
-#
-# !!! be careful when using parallel make execution and archives !!!
-# If multiple ar commands run at the same time on the same archive file,
-# they will not know about each other and can corrupt the file.
-# May be fixed in future.
-
-(%): %
-	$(AR) $(ARFLAGS) $@ $<
-
-#------------------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/README.txt'
--- a/storage/ndb/ndbjtie/README.txt	2009-10-09 20:15:02 +0000
+++ b/storage/ndb/ndbjtie/README.txt	2009-10-24 06:46:29 +0000
@@ -1,4 +1,7 @@
 
+XXX Martin: needs to be updated
+#if 0
+
 NDB JTie -- A Robust Java Wrapper for NDB API
 ---------------------------------------------
 
@@ -72,3 +75,5 @@ To Do List
 - uncomment & implement unmapped NDB API functions needed by Cluster/J
 
 - ...
+
+#endif

=== removed file 'storage/ndb/ndbjtie/env.properties'
--- a/storage/ndb/ndbjtie/env.properties	2009-10-15 21:27:09 +0000
+++ b/storage/ndb/ndbjtie/env.properties	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-# ----------------------------------------------------------------------
-#
-# Properties for External Dependencies
-#
-# ----------------------------------------------------------------------
-
-#
-# The NDB API Include and Library Paths
-#
-
-# relative path as seen from subproject's src directory
-NDB_SOURCE=../../..
-
-# source code:
-NDB_INCLUDEOPT=-I${NDB_SOURCE}/include
-NDBAPI_INCLUDEOPT=-I${NDB_SOURCE}/include/ndbapi
-MGMAPI_INCLUDEOPT=-I${NDB_SOURCE}/include/mgmapi
-NDB_LIBDIR=${NDB_SOURCE}/src/.libs
-
-# ----------------------------------------------------------------------
-
-#
-# The MySQL Client Include and Library Paths
-#
-
-# relative path as seen from subproject's src directory
-MYSQL_SOURCE=../../../../..
-
-# source code:
-MYSQL_INCLUDEOPT=-I${MYSQL_SOURCE}/include
-MYSQL_LIBDIR=${MYSQL_SOURCE}/libmysql/.libs
-
-# ----------------------------------------------------------------------
-
-#
-# The Include Path to the JDK's JNI Header Files
-#
-
-# Must be an ABSOLUTE PATH for building/running the jtie, ndbjtie subprojects
-
-ifneq (,$(findstring Darwin,$(shell uname)))
-JAVA_INCLUDEOPTS=-I"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers"
-else ifneq (,$(findstring Linux,$(shell uname)))
-JAVA_INCLUDEOPTS=-I"/usr/lib/jvm/java-6-sun/include" -I"/usr/lib/jvm/java-6-sun/include/linux"
-else
-JAVA_INCLUDEOPTS=
-endif
-
-# Comments:
-#
-# - make sure JAVA_INCLUDEOPTS points to the same location from where
-#   javac, javah, and java are being used for building and running
-#
-# - GCC may have its own jni.h in the compiler's standard include directories
-#   as part of the GNU Classpath project, which may get used silently if
-#   JAVA_INCLUDEOPTS is not defined or points to the wrong location
-#
-# - IMPORTANT: 32(64)bit Java VM requires 32(64)bit NDB libraries
-#
-#   for example: when using a JDK 6 on MacOS X (64 bit), all NDB dynamic
-#   libraries need have been build 64 bit too
-
-# ----------------------------------------------------------------------

=== removed file 'storage/ndb/ndbjtie/jtie/Makefile'
--- a/storage/ndb/ndbjtie/jtie/Makefile	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#------------------------------------------------------------------------------
-
-.PHONY:	all dep dbg opt prf clean mostlyclean distclean check
-all:	dbg
-
-dep dbg opt prf clean mostlyclean distclean check:
-	@cd src && $(MAKE) $(MFLAGS) $@
-	@cd test && $(MAKE) $(MFLAGS) $@
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/jtie/Makefile.am'
--- a/storage/ndb/ndbjtie/jtie/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/jtie/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 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
+
+## all subdirectories that have been configured (have a generated Makefile)
+DIST_SUBDIRS = src test
+
+## all subdirectories in DIST_SUBDIRS that should be built
+SUBDIRS = src test
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = include

=== removed file 'storage/ndb/ndbjtie/jtie/src/Makefile'
--- a/storage/ndb/ndbjtie/jtie/src/Makefile	2009-10-15 21:27:09 +0000
+++ b/storage/ndb/ndbjtie/jtie/src/Makefile	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-#------------------------------------------------------------------------------

-
-# read the generic settings
-include	../../Makefile.defaults
-include	../../env.properties
-
-#------------------------------------------------------------------------------
-
-  JTIE_JAR	= ../jtie.jar
-
-  API_PKG_PATH	= com/mysql/jtie
-
-  DELIVERABLES	= $(JTIE_JAR)
-
-  GENERATED_H	= com_mysql_jtie_Wrapper.h
-
-  CLEAN		= core *.o $(API_PKG_PATH)/*.class $(GENERATED_H)
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *% */*~
-
-  CLASSPATH	= "."
-
-#------------------------------------------------------------------------------

-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	$(GENERATED_H)
-
-com_mysql_jtie_Wrapper.h:	$(API_PKG_PATH)/Wrapper.class
-	$(COMPILE.javah) com.mysql.jtie.Wrapper
-
-$(API_PKG_PATH)/Wrapper.class:	\
-		$(API_PKG_PATH)/Wrapper.java
-	$(COMPILE.java) $<
-
-$(JTIE_JAR):	$(API_PKG_PATH)/Wrapper.class
-	$(JAR) -cf $@ $(API_PKG_PATH)
-
-check:
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------


=== added file 'storage/ndb/ndbjtie/jtie/src/Makefile.am'
--- a/storage/ndb/ndbjtie/jtie/src/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/jtie/src/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,56 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+## 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.
+jtiejar_DATA = $(JTIE_JAR)
+
+## where to install the jar file(s)
+jtiejardir = $(ndbjardir)
+
+## dependencies
+CLASSPATH += "."
+
+## jar file to be created
+JTIE_JAR = $(PACKAGE)-$(VERSION)-jtie.jar
+$(JTIE_JAR): $(JTIE_DIR) $(JTIE_CLASSES)
+	$(JAR) cvf $@ $(JTIE_DIR)
+
+## java top-level class files
+JTIE_DIR = com/mysql/jtie
+JTIE_CLASSES = $(JTIE_DIR)/Wrapper.class
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = $(JTIE_DIR)/*.java
+
+## generate JNI header files (for development only)
+javah: $(MYJAPI_CLASSES)
+	$(COMPILE.JAVAH) com.mysql.jtie.Wrapper
+
+## ----------------------------------------------------------------------
+
+## cleanup lists
+MOSTLYCLEANFILES = $(JTIE_DIR)/*.class *.h
+CLEANFILES = $(JTIE_JAR)
+
+## ----------------------------------------------------------------------

=== removed file 'storage/ndb/ndbjtie/jtie/test/Makefile'
--- a/storage/ndb/ndbjtie/jtie/test/Makefile	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#------------------------------------------------------------------------------
-
-.PHONY:	all dep dbg opt prf clean mostlyclean distclean check
-all:	dbg
-
-dep dbg opt prf clean mostlyclean distclean check:
-	@cd myapi && $(MAKE) $(MFLAGS) $@
-	@cd myjapi && $(MAKE) $(MFLAGS) $@
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/jtie/test/Makefile.am'
--- a/storage/ndb/ndbjtie/jtie/test/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,21 @@
+# Copyright (C) 2009 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
+
+## all subdirectories that have been configured (have a generated Makefile)
+DIST_SUBDIRS = myapi myjapi
+
+## all subdirectories in DIST_SUBDIRS that should be built
+SUBDIRS =  myapi myjapi

=== removed file 'storage/ndb/ndbjtie/jtie/test/myapi/Makefile'
--- a/storage/ndb/ndbjtie/jtie/test/myapi/Makefile	2009-10-15 22:00:52 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myapi/Makefile	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../../Makefile.defaults
-include	../../../env.properties
-
-#------------------------------------------------------------------------------
-
-  UTILS		= ../../../utils
-
-  DDEFINES 	=
-# -DJTIE_TRACE
-
-  DELIVERABLES	= libmyapi.a libmyapi.$(DLL_SUFFIX) myapi_test
-
-  OBJECTS	= myapi.o
-
-  CLEAN		= core *.o
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *%
-
-  INCLUDES	= $(JAVA_INCLUDEOPTS) -I. -I$(UTILS)
-
-  LDLIBS	=
-#  LDLIBS	= -lrt
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	
-
-myapi_test:	libmyapi.a
-
-#
-# linking order: by dependency (lib after objects/libs depending upon it)
-#
-
-libmyapi.a:	libmyapi.a($(OBJECTS))
-
-libmyapi.so libmyapi.dylib:	$(OBJECTS)
-
-.PHONY: check run.test
-
-check:	run.test
-
-run.test:	myapi_test
-	./myapi_test
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/jtie/test/myapi/Makefile.am'
--- a/storage/ndb/ndbjtie/jtie/test/myapi/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myapi/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,81 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+## automake flags (overridden by per-target flags, added before user flags)
+AM_CPPFLAGS = -I../../../utils
+
+## 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 = -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)
+myapi_test_LDFLAGS = -no-install ## never needs wrapper script
+
+## ----------------------------------------------------------------------
+
+## programs or scripts to run for testing
+TESTS = test_myapi.sh
+TESTS_ENVIRONMENT = $(SHELL)
+#TESTS_ENVIRONMENT = $(SHELL) -x
+
+test_myapi.sh: Makefile
+	echo "echo \"for test output see file: test_myapi_test.log\"" > $@
+	echo "test -f test_myapi_test.log && rm test_myapi_test.log" >> $@
+	echo "./myapi_test >& test_myapi_test.log" >> $@
+
+## ----------------------------------------------------------------------
+
+## cleanup
+MOSTLYCLEANFILES = *.log
+CLEANFILES = $(TESTS)
+
+## ----------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp	2009-09-22 14:40:40 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp	2009-10-24 06:46:29 +0000
@@ -646,13 +646,13 @@ test9()
 }
 
 template< typename E, void (F)(E) >
-void call(E e) 
+static void call(E e) 
 {
     (F)(e);
 }
 
 template< typename E, E (F)() >
-E call() 
+static E call() 
 {
     return (F)();
 }

=== removed file 'storage/ndb/ndbjtie/jtie/test/myjapi/Makefile'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/Makefile	2009-10-15 22:00:52 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/Makefile	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../../Makefile.defaults
-include	../../../env.properties
-
-#------------------------------------------------------------------------------
-
-  UTILS		= ../../../utils
-
-  JTIE		= ../..
-
-  MYAPI		= ../myapi
-
-  API_PKG_PATH	= myjapi
-
-  TEST_PKG_PATH	= test
-
-  DDEFINES 	=
-# -DJTIE_TRACE
-# -DJTIE_BYTEBUFFER_MAPS_TO_BASE_ADDRESS
-# -DJTIE_BYTEBUFFER_NO_ZERO_CAPACITY_MAPPING
-
-  DELIVERABLES	= libmyjapi.a libmyjapi.$(DLL_SUFFIX) \
-		$(TEST_PKG_PATH)/MyJapiTest.class \
-		$(TEST_PKG_PATH)/MyLoadUnloadTest.class
-
-  GENERATED_H	= myjapi_MyJapi.h \
-		myjapi_MyJapiCtypes.h \
-		myjapi_A.h \
-		myjapi_B0.h \
-		myjapi_B1.h \
-		myjapi_CI.h \
-		myjapi_CI_C0.h \
-		myjapi_CI_C0C.h \
-		myjapi_CI_C1.h \
-		myjapi_CI_C1C.h \
-		myjapi_D0.h \
-		myjapi_D1.h \
-		myjapi_D2.h
-
-  OBJECTS	= myjapi_classes.o \
-		myjapi_D.o myjapi_CI.o myjapi_B.o myjapi_A.o \
-		myjapi_MyJapiCtypes.o myjapi_MyJapi.o
-
-  CLEAN		= core *.o $(API_PKG_PATH)/*.class $(TEST_PKG_PATH)/*.class $(GENERATED_H)
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *% */*~
-
-  INCLUDES	= $(JAVA_INCLUDEOPTS) -I. -I$(UTILS) -I$(JTIE)/include \
-		-I$(MYAPI)
-
-  CLASSPATH	= ".:$(JTIE)/src"
-
-# CLOCK_GETTIME requires -lrt
-#  LDLIBS	= -lrt
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	$(GENERATED_H)
-
-myjapi_MyJapi.h:	myjapi/MyJapi.class
-	$(COMPILE.javah) myjapi.MyJapi
-
-myjapi_MyJapiCtypes.h:	myjapi/MyJapiCtypes.class
-	$(COMPILE.javah) myjapi.MyJapiCtypes
-
-myjapi_A.h:	myjapi/A.class
-	$(COMPILE.javah) myjapi.A
-
-myjapi_B0.h:	myjapi/B0.class
-	$(COMPILE.javah) myjapi.B0
-
-myjapi_B1.h:	myjapi/B1.class
-	$(COMPILE.javah) myjapi.B1
-
-myjapi_CI.h:	myjapi/CI.class
-	$(COMPILE.javah) myjapi.CI
-
-myjapi_D0.h:	myjapi/D0.class
-	$(COMPILE.javah) myjapi.D0
-
-myjapi_D1.h:	myjapi/D1.class
-	$(COMPILE.javah) myjapi.D1
-
-myjapi_D2.h:	myjapi/D2.class
-	$(COMPILE.javah) myjapi.D2
-
-$(TEST_PKG_PATH)/MyJapiTest.class:	\
-		$(TEST_PKG_PATH)/MyJapiTest.java \
-		myjapi/MyJapi.java \
-		myjapi/MyJapiCtypes.java \
-		myjapi/A.java \
-		myjapi/B0.java \
-		myjapi/B1.java \
-		myjapi/CI.java \
-		myjapi/D0.java \
-		myjapi/D1.java \
-		myjapi/D2.java
-	$(COMPILE.java) $<
-
-$(TEST_PKG_PATH)/MyLoadUnloadTest.class:	\
-		$(TEST_PKG_PATH)/MyLoadUnloadTest.java \
-		myjapi/MyJapi.java \
-		myjapi/MyJapiCtypes.java \
-		myjapi/A.java \
-		myjapi/B0.java \
-		myjapi/B1.java \
-		myjapi/CI.java \
-		myjapi/D0.java \
-		myjapi/D1.java \
-		myjapi/D2.java
-	$(COMPILE.java) $<
-
-#
-# linking order: by dependency (lib after objects/libs depending upon it)
-#
-
-libmyjapi.a:	libmyjapi.a($(OBJECTS))
-
-libmyjapi.so libmyjapi.dylib:	$(OBJECTS) $(MYAPI)/libmyapi.a
-
-# debug with -verbose:jni
-
-.PHONY: check run.test
-
-check:	run.test run.test1
-
-run.test:	$(TEST_PKG_PATH)/MyJapiTest.class
-	$(JAVA) $(JAVAFLAGS) -Xcheck:jni -classpath $(CLASSPATH) -Djava.library.path=".:$(MYAPI)" -ea test.MyJapiTest
-
-run.test1:	$(TEST_PKG_PATH)/MyLoadUnloadTest.class
-	$(JAVA) $(JAVAFLAGS) -Xcheck:jni -classpath $(CLASSPATH) -Djava.library.path=".:$(MYAPI)" -ea test.MyLoadUnloadTest
-
-#	$(JAVA) $(JAVAFLAGS) -classpath $(CLASSPATH) -ea -Djava.library.path=".:$(MYAPI)" test.MyJapiTest
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/jtie/test/myjapi/Makefile.am'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,149 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+# XXX hack for ndbjtie, needs to be fixed & cleaned up
+##if NDBJTIE_GCC_WORKAROUNDS
+AM_CXXFLAGS += -ansi -Wall -Wsign-promo
+##AM_CXXFLAGS += -fimplicit-templates
+CXXFLAGS += -fimplicit-templates
+##endif
+
+## ----------------------------------------------------------------------
+
+## 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.
+myjapijar_DATA = $(MYJAPI_JAR)
+
+## where to install the jar file(s)
+myjapijardir = $(ndbjardir)
+
+## dependencies
+JTIE_JAR = ../../src/$(PACKAGE)-$(VERSION)-jtie.jar
+CLASSPATH += ".:$(JTIE_JAR)"
+
+## jar file to be created
+MYJAPI_JAR = ../$(PACKAGE)-$(VERSION)-jtie-test.jar
+$(MYJAPI_JAR):	$(JTIE_JAR) \
+		$(MYJAPI_CLASSES) $(MYJAPI_DIR) \
+		$(TEST_CLASSES) $(TEST_DIR)
+	mkdir _jars
+	cd _jars && $(JAR) xvf ../$(JTIE_JAR) && $(JAR) cvf ../$@ .
+	rm -rf _jars
+	$(JAR) uvf $@ $(MYJAPI_DIR) $(TEST_DIR)
+
+## java top-level class files
+MYJAPI_DIR = myjapi
+MYJAPI_CLASSES = \
+		$(MYJAPI_DIR)/A.class \
+		$(MYJAPI_DIR)/B0.class \
+		$(MYJAPI_DIR)/B1.class \
+		$(MYJAPI_DIR)/CI.class \
+		$(MYJAPI_DIR)/D0.class \
+		$(MYJAPI_DIR)/D1.class \
+		$(MYJAPI_DIR)/D2.class \
+		$(MYJAPI_DIR)/MyJapi.class \
+		$(MYJAPI_DIR)/MyJapiCtypes.class
+TEST_DIR = test
+TEST_CLASSES = \
+		$(TEST_DIR)/MyJapiTest.class \
+		$(TEST_DIR)/MyLoadUnloadTest.class
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = $(MYJAPI_DIR)/*.java  $(TEST_DIR)/*.java
+
+## generate JNI header files (for development only)
+javah: $(MYJAPI_CLASSES)
+	$(COMPILE.JAVAH) \
+	myjapi.A \
+	myjapi.B0 \
+	myjapi.B1 \
+	myjapi.CI \
+	myjapi.D0 \
+	myjapi.D1 \
+	myjapi.D2 \
+	myjapi.MyJapi \
+	myjapi.MyJapiCtypes
+
+## ----------------------------------------------------------------------
+
+## automake flags (overridden by per-target flags, added before user flags)
+AM_CPPFLAGS = -I../../../utils -I../../include -I../myapi @JNI_INCLUDE_DIRS@
+
+## 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_A.cpp myjapi_B.cpp myjapi_CI.cpp myjapi_D.cpp \
+		myjapi_MyJapi.cpp myjapi_MyJapiCtypes.cpp \
+		myjapi_classes.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 = -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 = test_myjapi.sh test_unload.sh
+TESTS_ENVIRONMENT = $(SHELL)
+#TESTS_ENVIRONMENT = $(SHELL) -x
+
+JAVAFLAGS += -Xcheck:jni -ea -Djava.library.path=".:.libs"
+
+test_myjapi.sh: Makefile
+	echo "echo \"for test output see file: test_myjapi.log\"" > $@
+	echo "test -f test_myjapi.log && rm test_myjapi.log" >> $@
+	echo "$(JAVA) $(JAVAFLAGS) -classpath $(CLASSPATH) test.MyJapiTest >& test_myjapi.log" >> $@
+
+test_unload.sh: Makefile
+	echo "echo \"for test output see file: test_unload.log\"" > $@
+	echo "test -f test_unload.log && rm test_unload.log" >> $@
+	echo "$(JAVA) $(JAVAFLAGS) -classpath $(CLASSPATH) test.MyLoadUnloadTest >& test_unload.log" >> $@
+
+## ----------------------------------------------------------------------
+
+## cleanup
+MOSTLYCLEANFILES = $(MYJAPI_DIR)/*.class $(TEST_DIR)/*.class *.h *.log
+CLEANFILES = $(MYJAPI_JAR) $(TESTS)
+
+## ----------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_A.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_A.cpp	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_A.cpp	2009-10-24 06:46:29 +0000
@@ -21,15 +21,19 @@
 
 #include "myjapi_classes.hpp"
 
-// functions to implement
-#include "myjapi_A.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_A.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI function stubs
@@ -409,3 +413,5 @@ Java_myjapi_A_g3r(JNIEnv * env, jobject 
 }
 
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_B.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_B.cpp	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_B.cpp	2009-10-24 06:46:29 +0000
@@ -21,16 +21,20 @@
 
 #include "myjapi_classes.hpp"
 
-// functions to implement
-#include "myjapi_B0.h"
-#include "myjapi_B1.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_B0.h"
+//   #include "myjapi_B1.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI function stubs
@@ -169,3 +173,5 @@ Java_myjapi_B1_d0__Lmyjapi_B1_2I(JNIEnv 
 }
 
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_CI.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_CI.cpp	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_CI.cpp	2009-10-24 06:46:29 +0000
@@ -21,19 +21,23 @@
 
 #include "myjapi_classes.hpp"
 
-// functions to implement
-#include "myjapi_CI.h"
-#include "myjapi_CI_C0.h"
-#include "myjapi_CI_C0C.h"
-#include "myjapi_CI_C1.h"
-#include "myjapi_CI_C1C.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_CI.h"
+//   #include "myjapi_CI_C0.h"
+//   #include "myjapi_CI_C0C.h"
+//   #include "myjapi_CI_C1.h"
+//   #include "myjapi_CI_C1C.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI function stubs
@@ -48,10 +52,6 @@
 //
 // Outer$Inner is to be mangled as unicode escape: Outer_00024Inner, see:
 //   http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/design.html#wp615]Resolving%20Native%20Method%20Names
-//
-// As workaround, we redeclare the correct prototypes to have
-// external C linkage here:
-extern "C" {
 
 JNIEXPORT jobject JNICALL
 Java_myjapi_CI_00024C0_cc(JNIEnv * env, jclass cls)
@@ -224,6 +224,6 @@ Java_myjapi_CI_00024C1_take_1C1r(JNIEnv 
     gcall< ttrait_myjapi_CI$C1_t, ttrait_myjapi_CI$C1_r, &C1::take_C1r >(env, obj, p0);
 }
 
-} // extern "C"
-
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_D.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_D.cpp	2009-09-19 09:00:51 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_D.cpp	2009-10-24 06:46:29 +0000
@@ -21,17 +21,21 @@
 
 #include "myjapi_classes.hpp"
 
-// functions to implement
-#include "myjapi_D0.h"
-#include "myjapi_D1.h"
-#include "myjapi_D2.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_D0.h"
+//   #include "myjapi_D1.h"
+//   #include "myjapi_D2.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI function stubs
@@ -122,3 +126,5 @@ Java_myjapi_D2_sub(JNIEnv * env, jclass 
 }
 
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.cpp	2009-09-22 14:40:40 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.cpp	2009-10-24 06:46:29 +0000
@@ -22,15 +22,19 @@
 #include <stdint.h>
 #include <jni.h>
 
-// functions to implement
-#include "myjapi_MyJapi.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_MyJapi.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI function stubs
@@ -6297,5 +6301,4 @@ Java_myjapi_MyJapi_f784v1(JNIEnv * env, 
 
 // ---------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------
-
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.cpp	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.cpp	2009-10-24 06:46:29 +0000
@@ -22,15 +22,19 @@
 #include <stdint.h>
 #include <jni.h>
 
-// functions to implement
-#include "myjapi_MyJapiCtypes.h"
-
 // API to implement against
 #include "myapi.hpp"
 
 // libraries
-#include "jtie.hpp"
 #include "helpers.hpp"
+#include "jtie.hpp"
+
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+//   #include "myjapi_MyJapiCtypes.h"
+// if they are declared to receive "C" linkage here.
+extern "C" {
 
 // ---------------------------------------------------------------------------
 // API JNI platform-dependent function stubs
@@ -249,3 +253,5 @@ Java_myjapi_MyJapiCtypes_f45(JNIEnv * en
 }
 
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_classes.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_classes.cpp	2009-09-19 09:00:51 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_classes.cpp	2009-10-24 06:46:29 +0000
@@ -23,7 +23,6 @@
 
 // libraries
 #include "helpers.hpp"
-#include "jtie.hpp"
 
 // global jtie definitions to be included once only
 #include "jtie_lib.hpp"
@@ -54,7 +53,7 @@ JNI_OnLoad(JavaVM * jvm, void * reserved
 
     const jint required_jni_version = JTie_OnLoad(jvm, reserved);
     if (required_jni_version == JNI_ERR) {
-        CDBG << endl << "!!! error in " << __FILE__ << ", line: " << __LINE__
+        cout << endl << "!!! error in " << __FILE__ << ", line: " << __LINE__
              << ", msg: JTie_OnLoad() returned: JNI_ERR" << endl;
         return JNI_ERR;
     }

=== removed file 'storage/ndb/ndbjtie/mysql/Makefile'
--- a/storage/ndb/ndbjtie/mysql/Makefile	2009-10-09 20:15:02 +0000
+++ b/storage/ndb/ndbjtie/mysql/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#------------------------------------------------------------------------------
-
-.PHONY:	all dep dbg opt prf clean mostlyclean distclean check
-all:	dbg
-
-dep dbg opt prf clean mostlyclean distclean check:
-	@cd src && $(MAKE) $(MFLAGS) $@
-	@cd test && $(MAKE) $(MFLAGS) $@
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/mysql/Makefile.am'
--- a/storage/ndb/ndbjtie/mysql/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/mysql/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 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
+
+## all subdirectories that have been configured (have a generated Makefile)
+DIST_SUBDIRS = src test
+
+## all subdirectories in DIST_SUBDIRS that should be built
+SUBDIRS = src test
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = include

=== modified file 'storage/ndb/ndbjtie/mysql/src/CharsetMap.cpp'
--- a/storage/ndb/ndbjtie/mysql/src/CharsetMap.cpp	2009-10-19 15:10:56 +0000
+++ b/storage/ndb/ndbjtie/mysql/src/CharsetMap.cpp	2009-10-24 06:46:29 +0000
@@ -21,6 +21,8 @@
  *
  */
 
+#if 0 // XXX Martin: comment out for now due to undefined std::symbols
+
 #include "CharsetMap.h"
 #include "CharsetMapImpl.h"
 #include "my_global.h"
@@ -103,3 +105,5 @@ int CharsetMap::recode(long *lengths, in
     
     return RECODE_OK;  
 }
+
+#endif // XXX Martin: comment out for now due to undefined std::symbols

=== modified file 'storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.cpp'
--- a/storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.cpp	2009-10-19 04:52:57 +0000
+++ b/storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.cpp	2009-10-24 06:46:29 +0000
@@ -21,6 +21,8 @@
  *
 */
 
+#if 0 // XXX Martin: comment out for now due to undefined std::symbols
+
 #include "CharsetMapImpl.h"
 
 #include <map>
@@ -129,3 +131,5 @@ CharsetMapImpl::CharsetMapImpl() {  
 const char * CharsetMapImpl::getName(int csnum) const {
     return mysql_charset_name[csnum];
 }
+
+#endif // XXX Martin: comment out for now due to undefined std::symbols

=== modified file 'storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.h'
--- a/storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.h	2009-10-19 04:52:57 +0000
+++ b/storage/ndb/ndbjtie/mysql/src/CharsetMapImpl.h	2009-10-24 06:46:29 +0000
@@ -22,6 +22,8 @@
  *
  */
 
+#if 0 // XXX Martin: comment out for now due to undefined std::symbols
+
 class CharsetMapImpl {
 public:
     
@@ -42,3 +44,4 @@ public:
     int _UTF8Charset;
 };
 
+#endif // XXX Martin: comment out for now due to undefined std::symbols

=== removed file 'storage/ndb/ndbjtie/mysql/src/Makefile'
--- a/storage/ndb/ndbjtie/mysql/src/Makefile	2009-10-19 04:52:57 +0000
+++ b/storage/ndb/ndbjtie/mysql/src/Makefile	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../Makefile.defaults
-include	../../env.properties
-
-#------------------------------------------------------------------------------
-
-  DDEFINES 	=
-
-  DELIVERABLES	= libmysqlutils.a libmysqlutils.$(DLL_SUFFIX)
-
-  OBJECTS	= util_decimal.o CharsetMap.o CharsetMapImpl.o 
-
-  CLEAN		= core *.o
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *% */*~
-
-  INCLUDES	= -I../include $(MYSQL_INCLUDEOPT)
-
-  LDLIBS	=
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	$(GENERATED_H)
-
-#
-# linking order: by dependency (lib after objects/libs depending upon it)
-#
-
-libmysqlutils.a:	libmysqlutils.a($(OBJECTS))
-
-libmysqlutils.so libmysqlutils.dylib:	\
-			$(OBJECTS) $(MYSQL_LIBDIR)/libmysqlclient.a
-
-.PHONY: check
-check:
-	echo
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/mysql/src/Makefile.am'
--- a/storage/ndb/ndbjtie/mysql/src/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/mysql/src/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,67 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+## automake flags (overridden by per-target flags, added before user flags)
+AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
+
+## 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
+#check_LTLIBRARIES = libmysqlutils.la
+
+## source files to build the library (added to the distribution by default)
+libmysqlutils_la_SOURCES = \
+		util_decimal.cpp
+# XXX Martin: comment out for now due to undefined std::symbols
+#		CharsetMap.cpp \
+#		CharsetMapImpl.cpp
+# XXX Martin: comment out for now due to undefined std::symbols
+
+## 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 =
+
+## ----------------------------------------------------------------------
+
+## cleanup
+#MOSTLYCLEANFILES =
+#CLEANFILES =
+
+## ----------------------------------------------------------------------

=== removed file 'storage/ndb/ndbjtie/mysql/test/Makefile'
--- a/storage/ndb/ndbjtie/mysql/test/Makefile	2009-10-16 17:53:41 +0000
+++ b/storage/ndb/ndbjtie/mysql/test/Makefile	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../Makefile.defaults
-include	../../env.properties
-
-#------------------------------------------------------------------------------
-
-  DDEFINES 	=
-
-  DELIVERABLES	= mysql_utils_test
-
-  CLEAN		= core *.o
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *% */*~
-
-  INCLUDES	= -I../include
-
-  LDLIBS	=
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	$(GENERATED_H)
-
-mysql_utils_test: ../src/libmysqlutils.a \
-		$(MYSQL_LIBDIR)/libmysqlclient.a
-
-.PHONY: check run.test
-
-check:	run.test
-
-run.test:	mysql_utils_test
-	./mysql_utils_test
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== added file 'storage/ndb/ndbjtie/mysql/test/Makefile.am'
--- a/storage/ndb/ndbjtie/mysql/test/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/mysql/test/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,63 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+## automake flags (overridden by per-target flags, added before user flags)
+AM_CPPFLAGS = -I../include
+
+## 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 = ../src/libmysqlutils.la
+
+## mode-specific libtool options (overrides AM_LDFLAGS)
+#mysql_utils_test_LDFLAGS = -no-install ## never needs wrapper script
+#mysql_utils_test_LDFLAGS = -no-undefined ## build self-contained executable
+mysql_utils_test_LDFLAGS = -static ## only create a static executable
+
+## ----------------------------------------------------------------------
+

+## programs or scripts to run for testing
+# XXX Martin: as of now, this test is not suitable for a pre-install check,
+# due to the inter-library dependency upon installed libndbclient.la
+# (unless statically linked against libndbclient.a)
+#TESTS = test_mysql_utils.sh
+#TESTS_ENVIRONMENT = $(SHELL)
+#TESTS_ENVIRONMENT = $(SHELL) -x
+
+test_mysql_utils.sh: Makefile
+	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" >> $@
+
+## ----------------------------------------------------------------------
+
+## cleanup
+MOSTLYCLEANFILES = *.log
+CLEANFILES = $(TESTS)
+
+## ----------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp'
--- a/storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp	2009-10-19 15:10:56 +0000
+++ b/storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp	2009-10-24 06:46:29 +0000
@@ -63,6 +63,8 @@ int main()
     test_decimal("1,35", 20, 10, E_DEC_OK);
     test_decimal("text", 20, 10, E_DEC_BAD_NUM);
     
+#if 0 // XXX Martin: comment out for now due to undefined std::symbols
+
     /* CharsetMap */
     printf("\n==== CharsetMap ==== \n");
 
@@ -163,4 +165,6 @@ int main()
                            my_bad_utf8, result_buff_2);
     printf("Recode Test 5 - ill-formed source string: %d \n", rr5);
     assert(rr5 == RECODE_BAD_SRC);
+
+#endif // XXX Martin: comment out for now due to undefined std::symbols
 }

=== removed directory 'storage/ndb/ndbjtie/ndbjtie'
=== removed file 'storage/ndb/ndbjtie/ndbjtie/Makefile'
--- a/storage/ndb/ndbjtie/ndbjtie/Makefile	2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/ndbjtie/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#------------------------------------------------------------------------------
-
-.PHONY:	all dep dbg opt prf clean mostlyclean distclean check
-all:	dbg
-
-dep dbg opt prf clean mostlyclean distclean check:
-	@cd src && $(MAKE) $(MFLAGS) $@
-	@cd test && $(MAKE) $(MFLAGS) $@
-
-#------------------------------------------------------------------------------


=== removed file 'storage/ndb/ndbjtie/ndbjtie/src/Makefile'
--- a/storage/ndb/ndbjtie/ndbjtie/src/Makefile	2009-10-15 22:00:52 +0000
+++ b/storage/ndb/ndbjtie/ndbjtie/src/Makefile	1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../Makefile.defaults
-include	../../env.properties
-
-#------------------------------------------------------------------------------
-
-  NDBJTIE_JAR	= ../ndbjtie.jar
-
-  UTILS		= ../../utils
-
-  JTIE		= ../../jtie
-
-  MYSQL_UTILS	= ../../mysql
-
-  API_PKG_PATH0	= com/mysql/ndbjtie/mgmapi
-  API_PKG_PATH1	= com/mysql/ndbjtie/ndbapi
-  API_PKG_PATH2	= com/mysql/ndbjtie/mysql
-
-  DDEFINES 	=
-# -DJTIE_TRACE
-# -DJTIE_BYTEBUFFER_MAPS_TO_BASE_ADDRESS
-# -DJTIE_BYTEBUFFER_NO_ZERO_CAPACITY_MAPPING
-
-  DELIVERABLES	= $(NDBJTIE_JAR) libndbjtie.a libndbjtie.$(DLL_SUFFIX)
-
-  GENERATED_H	= \
-		com_mysql_ndbjtie_mgmapi_MGMAPI.h \
-		com_mysql_ndbjtie_ndbapi_NDBAPI.h \
-		com_mysql_ndbjtie_ndbapi_Ndb.h \
-		com_mysql_ndbjtie_ndbapi_NdbBlob.h \
-		com_mysql_ndbjtie_ndbapi_NdbDictionary.h \
-		com_mysql_ndbjtie_ndbapi_NdbError.h \
-		com_mysql_ndbjtie_ndbapi_NdbEventOperation.h \
-		com_mysql_ndbjtie_ndbapi_NdbIndexOperation.h \
-		com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation.h \
-		com_mysql_ndbjtie_ndbapi_NdbInterpretedCode.h \
-		com_mysql_ndbjtie_ndbapi_NdbOperation.h \
-		com_mysql_ndbjtie_ndbapi_NdbRecAttr.h \
-		com_mysql_ndbjtie_ndbapi_NdbRecord.h \
-		com_mysql_ndbjtie_ndbapi_NdbScanFilter.h \
-		com_mysql_ndbjtie_ndbapi_NdbScanOperation.h \
-		com_mysql_ndbjtie_ndbapi_NdbTransaction.h \
-		com_mysql_ndbjtie_ndbapi_Ndb_cluster_connection.h \
-		com_mysql_ndbjtie_mysql_Utils.h
-
-  OBJECTS	= mysql.o mgmapi.o ndbapi.o
-
-  CLEAN		= core *.o \
-		com_mysql_ndbjtie_*.h \
-		$(API_PKG_PATH0)/*.class$(API_PKG_PATH1)/*.class $(API_PKG_PATH2)/*.class
-#		$(GENERATED_H)
-
-  MOSTLYCLEAN	= $(DELIVERABLES) *.dSYM
-
-  DISTCLEAN	= *~ *% */*~
-
-  INCLUDES	= $(JAVA_INCLUDEOPTS) -I. -I$(UTILS) -I$(JTIE)/include \
-		-I$(MYSQL_UTILS)/include \
-		$(NDB_INCLUDEOPT) $(NDBAPI_INCLUDEOPT) $(MGMAPI_INCLUDEOPT)
-
-  CLASSPATH	= ".:$(JTIE)/src"
-
-# CLOCK_GETTIME requires -lrt
-ifneq (,$(findstring Darwin,$(shell uname)))
-LDLIBS=
-else ifneq (,$(findstring Linux,$(shell uname)))
-LDLIBS=-lrt
-else
-LDLIBS=
-endif
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:	$(GENERATED_H)
-
-com_mysql_ndbjtie_mgmapi_MGMAPI.h: \
-		$(API_PKG_PATH0)/MGMAPI.class
-	$(COMPILE.javah) com.mysql.ndbjtie.mgmapi.MGMAPI
-
-com_mysql_ndbjtie_ndbapi_NDBAPI.h: \
-		$(API_PKG_PATH1)/NDBAPI.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NDBAPI
-
-com_mysql_ndbjtie_ndbapi_Ndb.h: \
-		$(API_PKG_PATH1)/Ndb.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.Ndb
-
-com_mysql_ndbjtie_ndbapi_NdbBlob.h: \
-		$(API_PKG_PATH1)/NdbBlob.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbBlob
-
-com_mysql_ndbjtie_ndbapi_NdbDictionary.h: \
-		$(API_PKG_PATH1)/NdbDictionary.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbDictionary
-
-com_mysql_ndbjtie_ndbapi_NdbError.h: \
-		$(API_PKG_PATH1)/NdbError.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbError
-
-com_mysql_ndbjtie_ndbapi_NdbEventOperation.h: \
-		$(API_PKG_PATH1)/NdbEventOperation.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbEventOperation
-
-com_mysql_ndbjtie_ndbapi_NdbIndexOperation.h: \
-		$(API_PKG_PATH1)/NdbIndexOperation.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbIndexOperation
-
-com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation.h: \
-		$(API_PKG_PATH1)/NdbIndexScanOperation.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbIndexScanOperation
-
-com_mysql_ndbjtie_ndbapi_NdbInterpretedCode.h: \
-		$(API_PKG_PATH1)/NdbInterpretedCode.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbInterpretedCode
-
-com_mysql_ndbjtie_ndbapi_NdbOperation.h: \
-		$(API_PKG_PATH1)/NdbOperation.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbOperation
-
-com_mysql_ndbjtie_ndbapi_NdbRecAttr.h: \
-		$(API_PKG_PATH1)/NdbRecAttr.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbRecAttr
-
-com_mysql_ndbjtie_ndbapi_NdbRecord.h: \
-		$(API_PKG_PATH1)/NdbRecord.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbRecord
-
-com_mysql_ndbjtie_ndbapi_NdbScanFilter.h: \
-		$(API_PKG_PATH1)/NdbScanFilter.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbScanFilter
-
-com_mysql_ndbjtie_ndbapi_NdbScanOperation.h: \
-		$(API_PKG_PATH1)/NdbScanOperation.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbScanOperation
-
-com_mysql_ndbjtie_ndbapi_NdbTransaction.h: \
-		$(API_PKG_PATH1)/NdbTransaction.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.NdbTransaction
-
-com_mysql_ndbjtie_ndbapi_Ndb_cluster_connection.h: \
-		$(API_PKG_PATH1)/Ndb_cluster_connection.class
-	$(COMPILE.javah) com.mysql.ndbjtie.ndbapi.Ndb_cluster_connection
-
-com_mysql_ndbjtie_mysql_Utils.h: \
-		$(API_PKG_PATH2)/Utils.class
-	$(COMPILE.javah) com.mysql.ndbjtie.mysql.Utils
-
-$(NDBJTIE_JAR):	$(API_PKG_PATH0)/MGMAPI.class \
-		$(API_PKG_PATH1)/NDBAPI.class \
-		$(API_PKG_PATH1)/Ndb.class \
-		$(API_PKG_PATH1)/NdbBlob.class \
-		$(API_PKG_PATH1)/NdbBlobConst.class \
-		$(API_PKG_PATH1)/NdbConst.class \
-		$(API_PKG_PATH1)/NdbDictionary.class \
-		$(API_PKG_PATH1)/NdbError.class \
-		$(API_PKG_PATH1)/NdbErrorConst.class \
-		$(API_PKG_PATH1)/NdbEventOperation.class \
-		$(API_PKG_PATH1)/NdbEventOperationConst.class \
-		$(API_PKG_PATH1)/NdbIndexOperation.class \
-		$(API_PKG_PATH1)/NdbIndexOperationConst.class \
-		$(API_PKG_PATH1)/NdbIndexScanOperation.class \
-		$(API_PKG_PATH1)/NdbIndexScanOperationConst.class \
-		$(API_PKG_PATH1)/NdbInterpretedCode.class \
-		$(API_PKG_PATH1)/NdbInterpretedCodeConst.class \
-		$(API_PKG_PATH1)/NdbOperation.class \
-		$(API_PKG_PATH1)/NdbOperationConst.class \
-		$(API_PKG_PATH1)/NdbRecAttr.class \
-		$(API_PKG_PATH1)/NdbRecAttrConst.class \
-		$(API_PKG_PATH1)/NdbRecord.class \
-		$(API_PKG_PATH1)/NdbRecordConst.class \
-		$(API_PKG_PATH1)/NdbScanFilter.class \
-		$(API_PKG_PATH1)/NdbScanFilterConst.class \
-		$(API_PKG_PATH1)/NdbScanOperation.class \
-		$(API_PKG_PATH1)/NdbScanOperationConst.class \
-		$(API_PKG_PATH1)/NdbTransaction.class \
-		$(API_PKG_PATH1)/NdbTransactionConst.class \
-		$(API_PKG_PATH1)/Ndb_cluster_connection.class \
-		$(API_PKG_PATH1)/Ndb_cluster_connectionConst.class \
-		$(API_PKG_PATH2)/Utils.class
-	$(JAR) -cf $@ $(API_PKG_PATH0)/*.class $(API_PKG_PATH1)/*.class $(API_PKG_PATH2)/*.class
-
-#
-# linking order: by dependency (lib after objects/libs depending upon it)
-#
-
-libndbjtie.a:	libndbjtie.a($(OBJECTS))
-
-libndbjtie.so libndbjtie.dylib:	$(OBJECTS) \
-				$(MYSQL_UTILS)/src/libmysqlutils.a \
-				$(NDB_LIBDIR)/libndbclient.a
-
-.PHONY: check
-check:
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== removed file 'storage/ndb/ndbjtie/ndbjtie/test/Makefile'
--- a/storage/ndb/ndbjtie/ndbjtie/test/Makefile	2009-10-15 21:27:09 +0000
+++ b/storage/ndb/ndbjtie/ndbjtie/test/Makefile	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#------------------------------------------------------------------------------
-
-# read the generic settings
-include	../../Makefile.defaults
-include	../../env.properties
-
-#------------------------------------------------------------------------------
-
-  JTIE		= ../../jtie
-
-  NDBJTIE	= ..
-
-  UTILS		= ../../utils
-
-  TEST_PKG_PATH	= test
-
-  DDEFINES 	= 
-
-  DELIVERABLES	= $(TEST_PKG_PATH)/NdbJTieSmokeTest.class \
-		$(TEST_PKG_PATH)/MySqlUtilsSmokeTest.class
-
-  CLEAN		= core $(TEST_PKG_PATH)/*.class
-
-  MOSTLYCLEAN	= $(DELIVERABLES)
-
-  DISTCLEAN	= *~ *% */*~
-
-  INCLUDES	= -I../src -I$(UTILS)
-
-  CLASSPATH	= ".:$(NDBJTIE)/src:$(JTIE)/src"
-
-#------------------------------------------------------------------------------
-
-.PHONY:	all depend dep
-
-all:	$(DELIVERABLES)
-
-dep depend:
-
-.PHONY: check run.test
-
-check:	run.test
-
-run.test:	run.test0 run.test1
-
-run.test0:	$(TEST_PKG_PATH)/NdbJTieSmokeTest.class 
-	$(JAVA) $(JAVAFLAGS) -Xcheck:jni -classpath $(CLASSPATH) -ea -Djava.library.path="$(NDBJTIE)/src" test.NdbJTieSmokeTest
-
-run.test1:	$(TEST_PKG_PATH)/MySqlUtilsSmokeTest.class
-	$(JAVA) $(JAVAFLAGS) -Xcheck:jni -classpath $(CLASSPATH) -ea -Djava.library.path="$(NDBJTIE)/src" test.MySqlUtilsSmokeTest
-
-#------------------------------------------------------------------------------
-
-.depend:
-	touch $@
-
-# read local dependencies
--include	.depend
-
-#------------------------------------------------------------------------------

=== renamed directory 'storage/ndb/ndbjtie/ndbjtie/src' => 'storage/ndb/ndbjtie/src'
=== added file 'storage/ndb/ndbjtie/src/Makefile.am'
--- a/storage/ndb/ndbjtie/src/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/src/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,154 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+# XXX hack for ndbjtie, needs to be fixed & cleaned up
+##if NDBJTIE_GCC_WORKAROUNDS
+AM_CXXFLAGS += -ansi -Wall -Wsign-promo
+##AM_CXXFLAGS += -fimplicit-templates
+CXXFLAGS += -fimplicit-templates
+##endif
+
+## ----------------------------------------------------------------------
+
+## 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.
+ndbjtiejar_DATA = $(NDBJTIE_JAR)
+
+## where to install the jar file(s)
+ndbjtiejardir = $(ndbjardir)
+
+## dependencies
+JTIE_JAR = ../jtie/src/$(PACKAGE)-$(VERSION)-jtie.jar
+CLASSPATH += ".:$(JTIE_JAR)"
+
+## jar file to be created
+NDBJTIE_JAR = $(PACKAGE)-$(VERSION)-ndbjtie.jar
+$(NDBJTIE_JAR):	$(JTIE_JAR) \
+		$(MYSQL_CLASSES) $(MYSQL_DIR) \
+		$(MGMAPI_CLASSES) $(MGMAPI_DIR) \
+		$(NDBAPI_CLASSES) $(NDBAPI_DIR)
+	mkdir _jars
+	cd _jars && $(JAR) xvf ../$(JTIE_JAR) && $(JAR) cvf ../$@ .
+	rm -rf _jars
+	$(JAR) uvf $@ $(MYSQL_DIR) $(MGMAPI_DIR) $(NDBAPI_DIR)
+
+## java top-level class files
+MYSQL_DIR = com/mysql/ndbjtie/mysql
+MYSQL_CLASSES = \
+		$(MYSQL_DIR)/Utils.class
+MGMAPI_DIR = com/mysql/ndbjtie/mgmapi
+MGMAPI_CLASSES = \
+		$(MGMAPI_DIR)/MGMAPI.class
+NDBAPI_DIR = com/mysql/ndbjtie/ndbapi
+NDBAPI_CLASSES = \
+		$(NDBAPI_DIR)/NDBAPI.class \
+		$(NDBAPI_DIR)/Ndb.class \
+		$(NDBAPI_DIR)/NdbBlob.class \
+		$(NDBAPI_DIR)/NdbBlobConst.class \
+		$(NDBAPI_DIR)/NdbConst.class \
+		$(NDBAPI_DIR)/NdbDictionary.class \
+		$(NDBAPI_DIR)/NdbError.class \
+		$(NDBAPI_DIR)/NdbErrorConst.class \
+		$(NDBAPI_DIR)/NdbEventOperation.class \
+		$(NDBAPI_DIR)/NdbEventOperationConst.class \
+		$(NDBAPI_DIR)/NdbIndexOperation.class \
+		$(NDBAPI_DIR)/NdbIndexOperationConst.class \
+		$(NDBAPI_DIR)/NdbIndexScanOperation.class \
+		$(NDBAPI_DIR)/NdbIndexScanOperationConst.class \
+		$(NDBAPI_DIR)/NdbInterpretedCode.class \
+		$(NDBAPI_DIR)/NdbInterpretedCodeConst.class \
+		$(NDBAPI_DIR)/NdbOperation.class \
+		$(NDBAPI_DIR)/NdbOperationConst.class \
+		$(NDBAPI_DIR)/NdbRecAttr.class \
+		$(NDBAPI_DIR)/NdbRecAttrConst.class \
+		$(NDBAPI_DIR)/NdbRecord.class \
+		$(NDBAPI_DIR)/NdbRecordConst.class \
+		$(NDBAPI_DIR)/NdbScanFilter.class \
+		$(NDBAPI_DIR)/NdbScanFilterConst.class \
+		$(NDBAPI_DIR)/NdbScanOperation.class \
+		$(NDBAPI_DIR)/NdbScanOperationConst.class \
+		$(NDBAPI_DIR)/NdbTransaction.class \
+		$(NDBAPI_DIR)/NdbTransactionConst.class \
+		$(NDBAPI_DIR)/Ndb_cluster_connection.class \
+		$(NDBAPI_DIR)/Ndb_cluster_connectionConst.class
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = \
+		$(MYSQL_DIR)/*.java \
+		$(MGMAPI_DIR)/*.java \
+		$(NDBAPI_DIR)/*.java
+
+## generate JNI header files (for development only)
+javah: $(MYSQL_CLASSES) $(MGMAPI_CLASSES) $(NDBAPI_CLASSES)
+	$(COMPILE.JAVAH) \
+	ndbjtie.A
+
+## ----------------------------------------------------------------------
+
+## automake flags (overridden by per-target flags, added before user flags)
+AM_CPPFLAGS = \
+		-I../utils \
+		-I../jtie/include \
+		-I../mysql/include \
+		-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
+pkglib_LTLIBRARIES = libndbjtie.la
+
+## source files to build the library (added to distribuition by default)
+libndbjtie_la_SOURCES = mysql.cpp mgmapi.cpp ndbapi.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 = \
+		$(MYSQL_DIR)/*.class \
+		$(MGMAPI_DIR)/*.class \
+		$(NDBAPI_DIR)/*.class
+CLEANFILES = $(NDBJTIE_JAR)
+
+## ----------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/src/mgmapi.cpp'
--- a/storage/ndb/ndbjtie/ndbjtie/src/mgmapi.cpp	2009-10-06 21:41:38 +0000
+++ b/storage/ndb/ndbjtie/src/mgmapi.cpp	2009-10-24 06:46:29 +0000
@@ -16,30 +16,23 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 /*
- * ndbapi.cpp
+ * mgmapi.cpp
  */
 
 // API to implement against
-#include <mgmapi.h>
-#include <mgmapi_config_parameters.h>
-#include <mgmapi_debug.h>
-#include <mgmapi_error.h>
-#include <ndb_logevent.h>
-#include <ndbd_exit_codes.h>
-
-#if 0 // MMM! issues with NdbIndexStat (cannot include)
-//#include <NdbIndexStat.hpp>
-// which tries to include
-//#include <ndb_global.h>
-// which is nowhere to be found
-#endif // MMM! NdbIndexStat issue
+#include "mgmapi.h"
+//#include "mgmapi_config_parameters.h"
+//#include "mgmapi_debug.h"
+//#include "mgmapi_error.h"
+//#include "ndb_logevent.h"
+//#include "ndbd_exit_codes.h"
 
 // libraries
 #include "helpers.hpp"
 #include "jtie.hpp"
 
 // ---------------------------------------------------------------------------
-// NDB JTie function stubs
+// NDB MGMAPI JTie function stubs
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
@@ -68,6 +61,12 @@ typedef ttrait< jint, NdbBlob::State > t
 
 // ---------------------------------------------------------------------------
 
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+// if they are declared to receive "C" linkage here.
+extern "C" {
+
 // A javah bug in JDK 5
 //   http://forums.sun.com/thread.jspa?threadID=5115982&tstart=1499
 // generates a wrong name for native methods in static nested classes:
@@ -77,14 +76,10 @@ typedef ttrait< jint, NdbBlob::State > t
 //
 // Outer$Inner is to be mangled as unicode escape: Outer_00024Inner, see:
 //   http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/design.html#wp615]Resolving%20Native%20Method%20Names
-//
-// As workaround, we redeclare the correct prototypes to have
-// external C linkage here:
-extern "C" {
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_mgmapi_MGMAPI.h"
+//#include "com_mysql_ndbjtie_mgmapi_MGMAPI.h"
 
 // ---------------------------------------------------------------------------
 

=== modified file 'storage/ndb/ndbjtie/src/mysql.cpp'
--- a/storage/ndb/ndbjtie/ndbjtie/src/mysql.cpp	2009-10-03 06:20:33 +0000
+++ b/storage/ndb/ndbjtie/src/mysql.cpp	2009-10-24 06:46:29 +0000
@@ -50,7 +50,25 @@ define_class_mapping_ttraits( c_m_n_n_Nd
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_mysql_Utils.h"
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+// if they are declared to receive "C" linkage here.
+extern "C" {
+
+// A javah bug in JDK 5
+//   http://forums.sun.com/thread.jspa?threadID=5115982&tstart=1499
+// generates a wrong name for native methods in static nested classes:
+//
+// JDK 6 has this bug only partially fixed (nested classes as invocation
+// targets but not as parameters).
+//
+// Outer$Inner is to be mangled as unicode escape: Outer_00024Inner, see:
+//   http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/design.html#wp615]Resolving%20Native%20Method%20Names
+
+// ---------------------------------------------------------------------------
+
+//#include "com_mysql_ndbjtie_mysql_Utils.h"
 
 /*
  * Class:     com_mysql_ndbjtie_mysql_Utils
@@ -77,3 +95,5 @@ Java_com_mysql_ndbjtie_mysql_Utils_decim
 }    
 
 // ---------------------------------------------------------------------------
+
+} // extern "C"

=== modified file 'storage/ndb/ndbjtie/src/ndbapi.cpp'
--- a/storage/ndb/ndbjtie/ndbjtie/src/ndbapi.cpp	2009-10-09 18:18:42 +0000
+++ b/storage/ndb/ndbjtie/src/ndbapi.cpp	2009-10-24 06:46:29 +0000
@@ -20,8 +20,8 @@
  */
 
 // API to implement against
-#include <NdbApi.hpp>
-#include <NdbError.hpp>
+#include "NdbApi.hpp"
+#include "NdbError.hpp"
 
 // libraries
 #include "helpers.hpp"
@@ -31,7 +31,7 @@
 #include "jtie_lib.hpp"
 
 // ---------------------------------------------------------------------------
-// NDB JTie function stubs
+// NDBAPI JTie function stubs
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
@@ -439,6 +439,12 @@ typedef ttrait< jint, NdbTransaction::Co
 
 // ---------------------------------------------------------------------------
 
+// The API stub functions in this file have mangled names that adhere
+// to the JVM specification.  It is not necessary to include the
+// function prototypes generated by the javah tool from the Java source,
+// if they are declared to receive "C" linkage here.
+extern "C" {
+
 // A javah bug in JDK 5
 //   http://forums.sun.com/thread.jspa?threadID=5115982&tstart=1499
 // generates a wrong name for native methods in static nested classes:
@@ -448,14 +454,10 @@ typedef ttrait< jint, NdbTransaction::Co
 //
 // Outer$Inner is to be mangled as unicode escape: Outer_00024Inner, see:
 //   http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/design.html#wp615]Resolving%20Native%20Method%20Names
-//
-// As workaround, we redeclare the correct prototypes to have
-// external C linkage here:
-extern "C" {
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NDBAPI.h"
+//#include "com_mysql_ndbjtie_ndbapi_NDBAPI.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NDBAPI
@@ -507,7 +509,7 @@ Java_com_mysql_ndbjtie_ndbapi_NDBAPI_ret
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_Ndb.h"
+//#include "com_mysql_ndbjtie_ndbapi_Ndb.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_Ndb
@@ -779,7 +781,7 @@ Java_com_mysql_ndbjtie_ndbapi_Ndb_getNdb
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbBlob.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbBlob.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbBlob
@@ -1011,7 +1013,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbBlob_bl
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary
@@ -1171,7 +1173,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_AutoGrowSpecification.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_AutoGrowSpecification.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_AutoGrowSpecification
@@ -1295,7 +1297,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Column.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Column.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Column
@@ -1719,7 +1721,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Datafile.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Datafile.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Datafile
@@ -1903,7 +1905,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Dictionary
@@ -2297,7 +2299,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_List.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_List.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_List
@@ -2349,7 +2351,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_ListConst_Element.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_ListConst_Element.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_DictionaryConst_ListConst_Element
@@ -2581,7 +2583,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Event.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Event.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Event
@@ -2875,7 +2877,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Index.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Index.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Index
@@ -3109,7 +3111,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_LogfileGroup.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_LogfileGroup.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_LogfileGroup
@@ -3269,7 +3271,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Object.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Object.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Object
@@ -3285,7 +3287,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_ObjectId.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_ObjectId.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_ObjectId
@@ -3349,7 +3351,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeIndexHandle.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeIndexHandle.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeIndexHandle
@@ -3401,7 +3403,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeTableHandle.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeTableHandle.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_OptimizeTableHandle
@@ -3453,7 +3455,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_RecordSpecification.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_RecordSpecification.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_RecordSpecification
@@ -3577,7 +3579,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Table.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Table.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Table
@@ -4397,7 +4399,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Tablespace.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Tablespace.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Tablespace
@@ -4593,7 +4595,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Undofile.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbDictionary_Undofile.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbDictionary_Undofile
@@ -4765,7 +4767,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbDiction
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbError.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbError.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbError
@@ -4889,7 +4891,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbError_m
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbEventOperation.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbEventOperation.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbEventOperation
@@ -5109,7 +5111,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbEventOp
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbIndexOperation.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbIndexOperation.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbIndexOperation
@@ -5173,7 +5175,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexOp
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation
@@ -5273,7 +5275,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbIndexScanOperation_IndexBound
@@ -5469,7 +5471,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbIndexSc
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbInterpretedCode.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbInterpretedCode.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbInterpretedCode
@@ -6037,7 +6039,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbInterpr
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbOperation.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbOperation.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbOperation
@@ -6486,7 +6488,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbOperation_GetValueSpec.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbOperation_GetValueSpec.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbOperation_GetValueSpec
@@ -6562,7 +6564,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptions.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptions.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbOperation_OperationOptions
@@ -6758,7 +6760,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbOperation_SetValueSpec.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbOperation_SetValueSpec.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbOperation_SetValueSpec
@@ -6810,7 +6812,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbOperati
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbRecAttr.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbRecAttr.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbRecAttr
@@ -7042,7 +7044,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbRecAttr
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbScanFilter.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbScanFilter.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbScanFilter
@@ -7346,7 +7348,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbScanFil
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbScanOperation.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbScanOperation.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbScanOperation
@@ -7512,7 +7514,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbScanOpe
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptions.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptions.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbScanOperation_ScanOptions
@@ -7708,7 +7710,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbScanOpe
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_NdbTransaction.h"
+//#include "com_mysql_ndbjtie_ndbapi_NdbTransaction.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_NdbTransaction
@@ -8006,7 +8008,7 @@ Java_com_mysql_ndbjtie_ndbapi_NdbTransac
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_Ndb_Key_part_ptr.h"
+//#include "com_mysql_ndbjtie_ndbapi_Ndb_Key_part_ptr.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_Ndb_Key_part_ptr
@@ -8070,7 +8072,7 @@ Java_com_mysql_ndbjtie_ndbapi_Ndb_00024K
 
 // ---------------------------------------------------------------------------
 
-#include "com_mysql_ndbjtie_ndbapi_Ndb_cluster_connection.h"
+//#include "com_mysql_ndbjtie_ndbapi_Ndb_cluster_connection.h"
 
 /*
  * Class:     com_mysql_ndbjtie_ndbapi_Ndb_cluster_connection

=== renamed directory 'storage/ndb/ndbjtie/ndbjtie/test' => 'storage/ndb/ndbjtie/test'
=== added file 'storage/ndb/ndbjtie/test/Makefile.am'
--- a/storage/ndb/ndbjtie/test/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/ndbjtie/test/Makefile.am	2009-10-24 06:46:29 +0000
@@ -0,0 +1,80 @@
+# Copyright (C) 2009 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
+
+## ----------------------------------------------------------------------
+
+## 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.
+ndbjtie_test_jar_DATA = $(NDBJTIE_TEST_JAR)
+
+## where to install the jar file(s)
+ndbjtie_test_jardir = $(ndbjardir)
+
+## dependencies
+NDBJTIE_JAR = ../src/$(PACKAGE)-$(VERSION)-ndbjtie.jar
+CLASSPATH += ".:$(NDBJTIE_JAR)"
+
+## jar file to be created
+NDBJTIE_TEST_JAR = $(PACKAGE)-$(VERSION)-ndbjtie-test.jar
+$(NDBJTIE_TEST_JAR):	$(TEST_CLASSES) $(TEST_DIR)
+	$(JAR) cvf $@ $(TEST_DIR)
+
+## java top-level class files
+TEST_DIR = test
+TEST_CLASSES = \
+		$(TEST_DIR)/MySqlUtilsSmokeTest.class \
+		$(TEST_DIR)/NdbJTieSmokeTest.class
+
+## files to be distributed and not covered in the automatic rules
+EXTRA_DIST = $(TEST_DIR)/*.java
+
+## ----------------------------------------------------------------------
+
+## programs or scripts to run for testing
+# XXX Martin: as of now, these tests are not suitable for a pre-install check,
+# since
+# - both have an inter-library dependency upon installed libndbclient.la
+#   (unless statically linked against libndbclient.a)
+# - NdbJTieSmokeTest requires a running cluster (for now)
+#TESTS = test_mutils_smoke.sh test_ndbjtie_smoke.sh
+#TESTS_ENVIRONMENT = $(SHELL)
+#TESTS_ENVIRONMENT = $(SHELL) -x
+
+#JAVAFLAGS += -Xcheck:jni -ea -Djava.library.path=".:../src/.libs"
+JAVAFLAGS += -Xcheck:jni -ea -Djava.library.path="$(ndblibdir)"
+
+test_mutils_smoke.sh: Makefile
+	echo "echo \"for test output see file: test_mutils_smoke.log\"" > $@
+	echo "test -f test_mutils_smoke.log && rm test_mutils_smoke.log" >> $@
+	echo "$(JAVA) $(JAVAFLAGS) -classpath $(CLASSPATH) test.MySqlUtilsSmokeTest >& test_mutils_smoke.log" >> $@
+
+test_ndbjtie_smoke.sh: Makefile
+	echo "echo \"for test output see file: test_ndbjtie_smoke.log\"" > $@
+	echo "test -f test_ndbjtie_smoke.log && rm test_ndbjtie_smoke.log" >> $@
+	echo "$(JAVA) $(JAVAFLAGS) -classpath $(CLASSPATH) test.NdbJTieSmokeTest >& test_ndbjtie_smoke.log" >> $@
+
+## ----------------------------------------------------------------------
+
+## cleanup
+MOSTLYCLEANFILES = $(TEST_DIR)/*.class *.log
+CLEANFILES = $(NDBJTIE_TEST_JAR) $(TESTS)
+
+## ----------------------------------------------------------------------

=== modified file 'storage/ndb/ndbjtie/test/test/NdbJTieSmokeTest.java'
--- a/storage/ndb/ndbjtie/ndbjtie/test/test/NdbJTieSmokeTest.java	2009-10-03 06:20:33 +0000
+++ b/storage/ndb/ndbjtie/test/test/NdbJTieSmokeTest.java	2009-10-24 06:46:29 +0000
@@ -67,6 +67,8 @@ public class NdbJTieSmokeTest {
 
     protected void init() {
         // load native library (better diagnostics doing it explicitely)
+        // XXX remove when merged ndbjtie into ndbclient
+        loadSystemLibrary("ndbclient");
         loadSystemLibrary("ndbjtie");
 
         // instantiate NDB cluster singleton

=== modified file 'storage/ndb/ndbjtie/utils/helpers.hpp'
--- a/storage/ndb/ndbjtie/utils/helpers.hpp	2009-09-21 22:34:46 +0000
+++ b/storage/ndb/ndbjtie/utils/helpers.hpp	2009-10-24 06:46:29 +0000
@@ -50,16 +50,18 @@ using std::flush;
     } while (0)
 
 // an output stream for debug messages
-#if DEBUG
+/*
+#if JTIE_DEBUG
 #define CDBG if (0); else cout
 #else
 #define CDBG if (1); else cout
 #endif
+*/
 
 // some macros for tracing
 #ifdef JTIE_TRACE
-#  define ENTER(name) CDBG << "--> " << name << endl;
-#  define LEAVE(name) CDBG << "<-- " << name << endl;
+#  define ENTER(name) cout << "--> " << name << endl;
+#  define LEAVE(name) cout << "<-- " << name << endl;
 #  define TRACE(name) Tracer _tracer_(name);
 #else
 #  define ENTER(name)

Attachment: [text/bzr-bundle] bzr/martin.zaun@sun.com-20091024064629-497428wa6elpj2hw.bundle
Thread
bzr commit into mysql-5.1-telco-6.3-ndbjtie branch (martin.zaun:3083)Martin Zaun24 Oct