diff -r -u -N mysql-5.1.22-a/config/ac-macros/ha_ndbcluster.m4 mysql-5.1.22-b/config/ac-macros/ha_ndbcluster.m4
--- mysql-5.1.22-a/config/ac-macros/ha_ndbcluster.m4	2007-09-24 03:30:00.000000000 -0700
+++ mysql-5.1.22-b/config/ac-macros/ha_ndbcluster.m4	2007-11-02 21:53:24.000000000 -0700
@@ -361,6 +361,7 @@
    storage/ndb/src/mgmclient/Makefile dnl
    storage/ndb/src/cw/Makefile dnl
    storage/ndb/src/cw/cpcd/Makefile dnl
+   storage/ndb/src/helper/Makefile dnl
    storage/ndb/test/Makefile dnl
    storage/ndb/test/src/Makefile dnl
    storage/ndb/test/ndbapi/Makefile dnl
diff -r -u -N mysql-5.1.22-a/storage/ndb/src/Makefile.am mysql-5.1.22-b/storage/ndb/src/Makefile.am
--- mysql-5.1.22-a/storage/ndb/src/Makefile.am	2007-09-24 03:29:40.000000000 -0700
+++ mysql-5.1.22-b/storage/ndb/src/Makefile.am	2007-11-02 23:57:23.000000000 -0700
@@ -13,11 +13,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
+SUBDIRS = helper common mgmapi ndbapi . kernel mgmclient mgmsrv cw
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 
-ndblib_LTLIBRARIES = libndbclient.la
+ndblib_LTLIBRARIES = libndbclient.la libndbhelper.la
 
 libndbclient_la_SOURCES =
 
@@ -34,6 +34,10 @@
               common/portlib/libportlib.la      \
               common/util/libgeneral.la 
 
+libndbhelper_la_SOURCES =
+
+libndbhelper_la_LIBADD = helper/libhelper.la
+
 windoze-dsp: libndbclient.dsp
 
 libndbclient.dsp: Makefile \
diff -r -u -N mysql-5.1.22-a/storage/ndb/src/helper/Makefile.am mysql-5.1.22-b/storage/ndb/src/helper/Makefile.am
--- mysql-5.1.22-a/storage/ndb/src/helper/Makefile.am	1969-12-31 16:00:00.000000000 -0800
+++ mysql-5.1.22-b/storage/ndb/src/helper/Makefile.am	2007-11-02 21:59:24.000000000 -0700
@@ -0,0 +1,38 @@
+# Copyright (C) 2007 MySQL AB
+# 
+# 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
+
+noinst_LTLIBRARIES = libhelper.la
+
+libhelper_la_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/mysys
+
+libhelper_la_SOURCES = \
+       $(top_srcdir)/mysys/base64.c \
+       $(top_srcdir)/mysys/errors.c \
+       $(top_srcdir)/mysys/my_lib.c \
+       $(top_srcdir)/mysys/my_gethostbyname.c \
+       $(top_srcdir)/mysys/my_thr_init.c \
+       $(top_srcdir)/mysys/my_static.c \
+       $(top_srcdir)/mysys/my_messnc.c \
+       $(top_srcdir)/mysys/my_error.c \
+       $(top_srcdir)/mysys/my_pthread.c \
+       $(top_srcdir)/mysys/my_getwd.c \
+       $(top_srcdir)/strings/decimal.c
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%