Rediff embedded patch again.

1 files changed, 230 insertions, 247 deletions

diff --git a/02040_all_embedded-library-shared-5.1.50.patch b/02040_all_embedded-library-shared-5.1.50.patch
index 8d326ec..975ed43 100644
--- a/02040_all_embedded-library-shared-5.1.50.patch
+++ b/02040_all_embedded-library-shared-5.1.50.patch
@@ -18,13 +18,14 @@ X-Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=188019&action=view
 Signed-off-by: Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 
-Ported from the 5.1.43 patch. Take two by 
-Maciej Mrozowski <reavertm@gentoo.org>, on bug 306315.
+- Ported from the 5.1.43 patch. 
+- Take two by Maciej Mrozowski <reavertm@gentoo.org>, on bug 306315.
+- Also rediffed by robbat2 again.
 
-diff -ru ../mysql-5.1.50/client/Makefile.am ./client/Makefile.am
---- ../mysql-5.1.50/client/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./client/Makefile.am	2010-09-02 18:01:55.566385903 +0200
-@@ -75,7 +75,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/client/Makefile.am mysql/client/Makefile.am
+--- mysql.orig/client/Makefile.am	2010-09-02 20:38:44.061005582 +0000
++++ mysql/client/Makefile.am	2010-09-02 20:43:04.270330529 +0000
+@@ -75,7 +75,7 @@ mysqlimport_CFLAGS=		-DTHREAD -UUNDEF_TH
  mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
  				@CLIENT_EXTRA_LDFLAGS@ \
  				$(LIBMYSQLCLIENT_LA) \
@@ -33,7 +34,7 @@ diff -ru ../mysql-5.1.50/client/Makefile.am ./client/Makefile.am
  
  mysqlshow_SOURCES=		mysqlshow.c
  
-@@ -84,15 +84,15 @@
+@@ -84,15 +84,15 @@ mysqlslap_CFLAGS=		-DTHREAD -UMYSQL_CLIE
  mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
  				@CLIENT_EXTRA_LDFLAGS@ \
  				$(LIBMYSQLCLIENT_LA) \
@@ -52,10 +53,10 @@ diff -ru ../mysql-5.1.50/client/Makefile.am ./client/Makefile.am
  				$(CLIENT_THREAD_LIBS)
  
  mysql_upgrade_SOURCES=          mysql_upgrade.c \
-diff -ru ../mysql-5.1.50/configure.in ./configure.in
---- ../mysql-5.1.50/configure.in	2010-08-03 19:24:24.000000000 +0200
-+++ ./configure.in	2010-09-02 18:01:55.591402696 +0200
-@@ -2769,7 +2769,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/configure.in mysql/configure.in
+--- mysql.orig/configure.in	2010-09-02 20:38:44.061005582 +0000
++++ mysql/configure.in	2010-09-02 20:43:04.270330529 +0000
+@@ -2769,7 +2769,7 @@ server_scripts=
  
  dnl This probably should be cleaned up more - for now the threaded
  dnl client is just using plain-old libs.
@@ -64,7 +65,7 @@ diff -ru ../mysql-5.1.50/configure.in ./configure.in
  
  AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
  
-@@ -2797,20 +2797,18 @@
+@@ -2797,20 +2797,18 @@ fi
  AC_SUBST(netware_dir)
  AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
  
@@ -87,9 +88,9 @@ diff -ru ../mysql-5.1.50/configure.in ./configure.in
  
    sql_server="vio sql"
  fi
-diff -ru ../mysql-5.1.50/dbug/Makefile.am ./dbug/Makefile.am
---- ../mysql-5.1.50/dbug/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./dbug/Makefile.am	2010-09-02 18:01:55.592410189 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/dbug/Makefile.am mysql/dbug/Makefile.am
+--- mysql.orig/dbug/Makefile.am	2010-09-02 20:38:44.061005582 +0000
++++ mysql/dbug/Makefile.am	2010-09-02 20:43:04.270330529 +0000
 @@ -16,10 +16,10 @@
  # MA 02111-1307, USA
  
@@ -104,7 +105,7 @@ diff -ru ../mysql-5.1.50/dbug/Makefile.am ./dbug/Makefile.am
  EXTRA_DIST =            CMakeLists.txt example1.c example2.c example3.c \
                          user.r monty.doc dbug_add_tags.pl \
                          my_main.c main.c factorial.c dbug_analyze.c \
-@@ -31,11 +31,11 @@
+@@ -31,11 +31,11 @@ CLEANFILES =            $(NROFF_INC) use
  
  
  # Must be linked with libs that are not compiled yet
@@ -118,9 +119,9 @@ diff -ru ../mysql-5.1.50/dbug/Makefile.am ./dbug/Makefile.am
  
  user.t:         user.r $(NROFF_INC)
  		-nroff -mm user.r > $@
-diff -ru ../mysql-5.1.50/extra/Makefile.am ./extra/Makefile.am
---- ../mysql-5.1.50/extra/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./extra/Makefile.am	2010-09-02 18:01:55.593410477 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/extra/Makefile.am mysql/extra/Makefile.am
+--- mysql.orig/extra/Makefile.am	2010-09-02 20:38:44.061005582 +0000
++++ mysql/extra/Makefile.am	2010-09-02 20:43:04.270330529 +0000
 @@ -15,8 +15,8 @@
  
  INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
@@ -132,10 +133,10 @@ diff -ru ../mysql-5.1.50/extra/Makefile.am ./extra/Makefile.am
  			$(ZLIB_LIBS)
  BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                          $(top_builddir)/include/sql_state.h \
-diff -ru ../mysql-5.1.50/libmysql/Makefile.am ./libmysql/Makefile.am
---- ../mysql-5.1.50/libmysql/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./libmysql/Makefile.am	2010-09-02 18:01:55.594410395 +0200
-@@ -106,8 +106,8 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/libmysql/Makefile.am mysql/libmysql/Makefile.am
+--- mysql.orig/libmysql/Makefile.am	2010-09-02 20:38:44.061005582 +0000
++++ mysql/libmysql/Makefile.am	2010-09-02 20:43:04.270330529 +0000
+@@ -106,8 +106,8 @@ do-lib-dist:
  	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \
  	echo 'CFLAGS=	-I. -DMYSQL_CLIENT_NO_THREADS' >>$$dir/Makefile; \
  	echo "obj=$$objs"  >>$$dir/Makefile; \
@@ -146,10 +147,10 @@ diff -ru ../mysql-5.1.50/libmysql/Makefile.am ./libmysql/Makefile.am
  	echo '	$$(AR) r $$@ $$?'  >>$$dir/Makefile; \
  	gtar cvzf $$dir.tar.gz $$dir; \
  	cd $$dir; gmake
-diff -ru ../mysql-5.1.50/libmysqld/examples/Makefile.am ./libmysqld/examples/Makefile.am
---- ../mysql-5.1.50/libmysqld/examples/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./libmysqld/examples/Makefile.am	2010-09-02 19:22:02.032161969 +0200
-@@ -37,13 +37,14 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/libmysqld/examples/Makefile.am mysql/libmysqld/examples/Makefile.am
+--- mysql.orig/libmysqld/examples/Makefile.am	2010-09-02 20:38:44.061005582 +0000
++++ mysql/libmysqld/examples/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -37,13 +37,14 @@ INCLUDES =	-I$(top_builddir)/include -I$
  		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
  		$(openssl_includes)
  LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
@@ -167,7 +168,7 @@ diff -ru ../mysql-5.1.50/libmysqld/examples/Makefile.am ./libmysqld/examples/Mak
  
  nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
                  my_readline.h sql_string.h completion_hash.h
-@@ -51,6 +52,7 @@
+@@ -51,6 +52,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_L
  
  mysql_client_test_embedded_LINK = $(CXXLINK)
  nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
@@ -175,10 +176,10 @@ diff -ru ../mysql-5.1.50/libmysqld/examples/Makefile.am ./libmysqld/examples/Mak
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
-diff -ru ../mysql-5.1.50/libmysqld/Makefile.am ./libmysqld/Makefile.am
---- ../mysql-5.1.50/libmysqld/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./libmysqld/Makefile.am	2010-09-02 21:29:54.843833521 +0200
-@@ -36,8 +36,8 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/libmysqld/Makefile.am mysql/libmysqld/Makefile.am
+--- mysql.orig/libmysqld/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/libmysqld/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -36,8 +36,8 @@ INCLUDES=		-I$(top_builddir)/include -I$
  			$(openssl_includes) @ZLIB_INCLUDES@ \
  			@condition_dependent_plugin_includes@
  
@@ -189,7 +190,7 @@ diff -ru ../mysql-5.1.50/libmysqld/Makefile.am ./libmysqld/Makefile.am
  SUBDIRS =		. examples
  libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc
  libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
-@@ -79,11 +79,10 @@
+@@ -79,11 +79,10 @@ sqlsources = derror.cc field.cc field_co
  	rpl_injector.cc my_user.c partition_info.cc \
  	sql_servers.cc event_parse_data.cc
  
@@ -204,7 +205,7 @@ diff -ru ../mysql-5.1.50/libmysqld/Makefile.am ./libmysqld/Makefile.am
  storagesources = @condition_dependent_plugin_modules@
  storageobjects = @condition_dependent_plugin_objects@
  storagesourceslinks = @condition_dependent_plugin_links@
-@@ -91,19 +90,20 @@
+@@ -91,19 +90,20 @@ storagesourceslinks = @condition_depende
  # automake misses these
  sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
  
@@ -235,7 +236,7 @@ diff -ru ../mysql-5.1.50/libmysqld/Makefile.am ./libmysqld/Makefile.am
  endif
  
  # Storage engine specific compilation options
-@@ -139,51 +139,13 @@
+@@ -139,51 +139,13 @@ ha_myisam.o:ha_myisam.cc
  ha_myisammrg.o:ha_myisammrg.cc
  		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
  
@@ -289,10 +290,10 @@ diff -ru ../mysql-5.1.50/libmysqld/Makefile.am ./libmysqld/Makefile.am
  
  BUILT_SOURCES = link_sources
  
-diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
---- ../mysql-5.1.50/mysys/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./mysys/Makefile.am	2010-09-02 18:01:55.597428806 +0200
-@@ -18,10 +18,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/mysys/Makefile.am mysql/mysys/Makefile.am
+--- mysql.orig/mysys/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/mysys/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -18,10 +18,9 @@ MYSQLSHAREdir =		$(pkgdatadir)
  MYSQLBASEdir=		$(prefix)
  INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
  			-I$(top_srcdir)/include -I$(srcdir)
@@ -305,7 +306,7 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  			mf_path.c mf_loadpath.c my_file.c \
  			my_open.c my_create.c my_dup.c my_seek.c my_read.c \
  			my_pread.c my_write.c my_getpagesize.c \
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ libmysys_a_SOURCES =    my_init.c my_get
  			my_quick.c my_lockmem.c my_static.c \
  			my_sync.c my_getopt.c my_mkdir.c \
  			default_modify.c default.c \
@@ -314,7 +315,7 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  			my_net.c my_port.c my_sleep.c \
  			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
  			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
-@@ -53,22 +52,23 @@
+@@ -53,22 +52,23 @@ libmysys_a_SOURCES =    my_init.c my_get
  			my_memmem.c stacktrace.c \
  			my_windac.c my_access.c base64.c my_libwrap.c
  
@@ -344,7 +345,7 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
  			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
  			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-@@ -78,8 +78,6 @@
+@@ -78,8 +78,6 @@ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\"
  			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
                          @DEFS@
  
@@ -353,7 +354,7 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  # I hope this always does the right thing. Otherwise this is only test programs
  FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
  
-@@ -88,39 +86,39 @@
+@@ -88,39 +86,39 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(
  # which automaticly removes the object files you use to compile a final program
  #
  
@@ -402,7 +403,7 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
  
  test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
-@@ -128,7 +126,7 @@
+@@ -128,7 +126,7 @@ test_gethwaddr$(EXEEXT): my_gethwaddr.c
  	$(LINK) $(FLAGS) -DMAIN  ./test_gethwaddr.c $(LDADD) $(LIBS)
  	$(RM) -f ./test_gethwaddr.c
  
@@ -411,9 +412,9 @@ diff -ru ../mysql-5.1.50/mysys/Makefile.am ./mysys/Makefile.am
  	$(CP) $(srcdir)/base64.c ./test_base64.c
  	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)
  	$(RM) -f ./test_base64.c
-diff -ru ../mysql-5.1.50/netware/Makefile.am ./netware/Makefile.am
---- ../mysql-5.1.50/netware/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./netware/Makefile.am	2010-09-02 18:01:55.598441732 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/netware/Makefile.am mysql/netware/Makefile.am
+--- mysql.orig/netware/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/netware/Makefile.am	2010-09-02 20:43:04.273663976 +0000
 @@ -16,14 +16,13 @@
  
  if HAVE_NETWARE
@@ -431,10 +432,10 @@ diff -ru ../mysql-5.1.50/netware/Makefile.am ./netware/Makefile.am
  				@openssl_libs@ @yassl_libs@
  
  netware_build_files =           client/mysql.def client/mysqladmin.def \
-diff -ru ../mysql-5.1.50/pstack/Makefile.am ./pstack/Makefile.am
---- ../mysql-5.1.50/pstack/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./pstack/Makefile.am	2010-09-02 18:01:55.599448041 +0200
-@@ -22,8 +22,8 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/pstack/Makefile.am mysql/pstack/Makefile.am
+--- mysql.orig/pstack/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/pstack/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -22,8 +22,8 @@ SUBDIRS =		aout
  
  INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
  
@@ -445,9 +446,9 @@ diff -ru ../mysql-5.1.50/pstack/Makefile.am ./pstack/Makefile.am
  			debug.c ieee.c pstack.c stabs.c
  noinst_HEADERS =	bucomm.h debug.h ieee.h budbg.h demangle.h \
  			linuxthreads.h pstack.h pstacktrace.h
-diff -ru ../mysql-5.1.50/regex/Makefile.am ./regex/Makefile.am
---- ../mysql-5.1.50/regex/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./regex/Makefile.am	2010-09-02 18:01:55.599448041 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/regex/Makefile.am mysql/regex/Makefile.am
+--- mysql.orig/regex/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/regex/Makefile.am	2010-09-02 20:43:04.273663976 +0000
 @@ -16,10 +16,10 @@
  # MA 02111-1307, USA
  
@@ -462,10 +463,10 @@ diff -ru ../mysql-5.1.50/regex/Makefile.am ./regex/Makefile.am
  noinst_PROGRAMS =	re
  re_SOURCES =		split.c debug.c main.c
  re_LDFLAGS= @NOINST_LDFLAGS@
-diff -ru ../mysql-5.1.50/server-tools/instance-manager/Makefile.am ./server-tools/instance-manager/Makefile.am
---- ../mysql-5.1.50/server-tools/instance-manager/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./server-tools/instance-manager/Makefile.am	2010-09-02 18:01:55.600455696 +0200
-@@ -23,8 +23,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/server-tools/instance-manager/Makefile.am mysql/server-tools/instance-manager/Makefile.am
+--- mysql.orig/server-tools/instance-manager/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/server-tools/instance-manager/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -23,8 +23,7 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_S
  # default_options.h, generated from default_options.h.in)
  # See automake/autoconf docs for details
  
@@ -475,7 +476,7 @@ diff -ru ../mysql-5.1.50/server-tools/instance-manager/Makefile.am ./server-tool
  
  liboptions_la_CXXFLAGS= $(CXXFLAGS) \
  	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
-@@ -36,17 +35,17 @@
+@@ -36,17 +35,17 @@ liboptions_la_CXXFLAGS= $(CXXFLAGS) \
  	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
  
  liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
@@ -500,7 +501,7 @@ diff -ru ../mysql-5.1.50/server-tools/instance-manager/Makefile.am ./server-tool
  
  CLEANFILES= net_serv.cc client_settings.h
  
-@@ -86,11 +85,11 @@
+@@ -86,11 +85,11 @@ mysqlmanager_SOURCES=	command.cc command
  
  mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
  			liboptions.la \
@@ -517,10 +518,10 @@ diff -ru ../mysql-5.1.50/server-tools/instance-manager/Makefile.am ./server-tool
  			@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
  
  EXTRA_DIST =		WindowsService.cpp WindowsService.h IMService.cpp \
-diff -ru ../mysql-5.1.50/sql/Makefile.am ./sql/Makefile.am
---- ../mysql-5.1.50/sql/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./sql/Makefile.am	2010-09-02 18:01:55.601467207 +0200
-@@ -32,11 +32,12 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/sql/Makefile.am mysql/sql/Makefile.am
+--- mysql.orig/sql/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/sql/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -32,11 +32,12 @@ bin_PROGRAMS =		mysql_tzinfo_to_sql
  noinst_LTLIBRARIES=	libndb.la \
  			udf_example.la
  
@@ -538,10 +539,10 @@ diff -ru ../mysql-5.1.50/sql/Makefile.am ./sql/Makefile.am
  mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
  LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
  mysqld_LDADD =		libndb.la \
-diff -ru ../mysql-5.1.50/storage/archive/Makefile.am ./storage/archive/Makefile.am
---- ../mysql-5.1.50/storage/archive/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/archive/Makefile.am	2010-09-02 18:01:55.602475160 +0200
-@@ -23,17 +23,18 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/archive/Makefile.am mysql/storage/archive/Makefile.am
+--- mysql.orig/storage/archive/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/archive/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -23,17 +23,18 @@ pkgplugindir =		$(pkglibdir)/plugin
  INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
  			-I$(top_srcdir)/regex \
  			-I$(top_srcdir)/sql \
@@ -562,7 +563,7 @@ diff -ru ../mysql-5.1.50/storage/archive/Makefile.am ./storage/archive/Makefile.
  pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
  ha_archive_la_LDFLAGS =	-module -rpath $(pkgplugindir)
  ha_archive_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-@@ -41,26 +42,25 @@
+@@ -41,26 +42,25 @@ ha_archive_la_CFLAGS =	$(AM_CFLAGS) -DMY
  ha_archive_la_SOURCES =	ha_archive.cc azio.c
  
  
@@ -599,19 +600,19 @@ diff -ru ../mysql-5.1.50/storage/archive/Makefile.am ./storage/archive/Makefile.
  			@ZLIB_LIBS@
  archive_reader_LDFLAGS = @NOINST_LDFLAGS@
  
-diff -ru ../mysql-5.1.50/storage/archive/plug.in ./storage/archive/plug.in
---- ../mysql-5.1.50/storage/archive/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/archive/plug.in	2010-09-02 18:01:55.603486648 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/archive/plug.in mysql/storage/archive/plug.in
+--- mysql.orig/storage/archive/plug.in	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/archive/plug.in	2010-09-02 20:43:04.273663976 +0000
 @@ -1,4 +1,4 @@
  MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],
          [Archive Storage Engine], [max,max-no-ndb])
 -MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])
 +MYSQL_PLUGIN_STATIC(archive,    [libarchive.la])
  MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])
-diff -ru ../mysql-5.1.50/storage/blackhole/Makefile.am ./storage/blackhole/Makefile.am
---- ../mysql-5.1.50/storage/blackhole/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/blackhole/Makefile.am	2010-09-02 18:01:55.604486760 +0200
-@@ -27,12 +27,13 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/blackhole/Makefile.am mysql/storage/blackhole/Makefile.am
+--- mysql.orig/storage/blackhole/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/blackhole/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -27,12 +27,13 @@ INCLUDES =              -I$(top_srcdir)/
  WRAPLIBS=
  
  LDADD =
@@ -626,7 +627,7 @@ diff -ru ../mysql-5.1.50/storage/blackhole/Makefile.am ./storage/blackhole/Makef
  pkgplugin_LTLIBRARIES =	@plugin_blackhole_shared_target@
  ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
  ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-@@ -40,11 +41,10 @@
+@@ -40,11 +41,10 @@ ha_blackhole_la_CFLAGS=	$(AM_CFLAGS) -DM
  ha_blackhole_la_SOURCES=ha_blackhole.cc
  
  
@@ -642,9 +643,9 @@ diff -ru ../mysql-5.1.50/storage/blackhole/Makefile.am ./storage/blackhole/Makef
  
  
  EXTRA_DIST =		CMakeLists.txt plug.in
-diff -ru ../mysql-5.1.50/storage/blackhole/plug.in ./storage/blackhole/plug.in
---- ../mysql-5.1.50/storage/blackhole/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/blackhole/plug.in	2010-09-02 18:01:55.604486760 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/blackhole/plug.in mysql/storage/blackhole/plug.in
+--- mysql.orig/storage/blackhole/plug.in	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/blackhole/plug.in	2010-09-02 20:43:04.273663976 +0000
 @@ -1,6 +1,5 @@
  MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
          [Basic Write-only Read-never tables], [max,max-no-ndb])
@@ -653,10 +654,10 @@ diff -ru ../mysql-5.1.50/storage/blackhole/plug.in ./storage/blackhole/plug.in
 +MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.la])
  MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
 -
-diff -ru ../mysql-5.1.50/storage/csv/Makefile.am ./storage/csv/Makefile.am
---- ../mysql-5.1.50/storage/csv/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/csv/Makefile.am	2010-09-02 18:01:55.605486150 +0200
-@@ -25,20 +25,20 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/csv/Makefile.am mysql/storage/csv/Makefile.am
+--- mysql.orig/storage/csv/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/csv/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -25,20 +25,20 @@ INCLUDES =              -I$(top_builddir
  			-I$(top_srcdir)/sql \
                          -I$(srcdir)
  LDADD =
@@ -682,9 +683,9 @@ diff -ru ../mysql-5.1.50/storage/csv/Makefile.am ./storage/csv/Makefile.am
  
  EXTRA_DIST =		CMakeLists.txt plug.in
  # Don't update the files from bitkeeper
-diff -ru ../mysql-5.1.50/storage/csv/plug.in ./storage/csv/plug.in
---- ../mysql-5.1.50/storage/csv/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/csv/plug.in	2010-09-02 18:01:55.606498019 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/csv/plug.in mysql/storage/csv/plug.in
+--- mysql.orig/storage/csv/plug.in	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/csv/plug.in	2010-09-02 20:43:04.273663976 +0000
 @@ -1,5 +1,5 @@
  MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],
          [Stores tables in text CSV format])
@@ -693,10 +694,10 @@ diff -ru ../mysql-5.1.50/storage/csv/plug.in ./storage/csv/plug.in
 -MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging
 +MYSQL_PLUGIN_STATIC(csv,        [libcsv.la])
 +MYSQL_PLUGIN_DYNAMIC(csv,       [ha_csv.la])
-diff -ru ../mysql-5.1.50/storage/example/Makefile.am ./storage/example/Makefile.am
---- ../mysql-5.1.50/storage/example/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/example/Makefile.am	2010-09-02 18:01:55.607509508 +0200
-@@ -27,6 +27,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/example/Makefile.am mysql/storage/example/Makefile.am
+--- mysql.orig/storage/example/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/example/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -27,6 +27,7 @@ INCLUDES =              -I$(top_srcdir)/
  WRAPLIBS=
  
  LDADD =
@@ -704,10 +705,10 @@ diff -ru ../mysql-5.1.50/storage/example/Makefile.am ./storage/example/Makefile.
  
  DEFS =                  @DEFS@
  
-diff -ru ../mysql-5.1.50/storage/federated/Makefile.am ./storage/federated/Makefile.am
---- ../mysql-5.1.50/storage/federated/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/federated/Makefile.am	2010-09-02 18:01:55.607509508 +0200
-@@ -27,12 +27,13 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/federated/Makefile.am mysql/storage/federated/Makefile.am
+--- mysql.orig/storage/federated/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/federated/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -27,12 +27,13 @@ INCLUDES =              -I$(top_srcdir)/
  WRAPLIBS=
  
  LDADD =
@@ -722,7 +723,7 @@ diff -ru ../mysql-5.1.50/storage/federated/Makefile.am ./storage/federated/Makef
  pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
  ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
  ha_federated_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-@@ -40,11 +41,10 @@
+@@ -40,11 +41,10 @@ ha_federated_la_CFLAGS =	$(AM_CFLAGS) -D
  ha_federated_la_SOURCES =	ha_federated.cc
  
  
@@ -738,9 +739,9 @@ diff -ru ../mysql-5.1.50/storage/federated/Makefile.am ./storage/federated/Makef
  
  
  EXTRA_DIST =		CMakeLists.txt plug.in
-diff -ru ../mysql-5.1.50/storage/federated/plug.in ./storage/federated/plug.in
---- ../mysql-5.1.50/storage/federated/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/federated/plug.in	2010-09-02 18:01:55.608539476 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/federated/plug.in mysql/storage/federated/plug.in
+--- mysql.orig/storage/federated/plug.in	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/federated/plug.in	2010-09-02 20:43:04.273663976 +0000
 @@ -1,5 +1,5 @@
  MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
          [Connects to tables on remote MySQL servers], [max,max-no-ndb])
@@ -749,10 +750,10 @@ diff -ru ../mysql-5.1.50/storage/federated/plug.in ./storage/federated/plug.in
 +MYSQL_PLUGIN_STATIC(federated,    [libfederated.la])
  MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])
 +MYSQL_PLUGIN_DYNAMIC(federated,   [ha_federated.la])
-diff -ru ../mysql-5.1.50/storage/heap/Makefile.am ./storage/heap/Makefile.am
---- ../mysql-5.1.50/storage/heap/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/heap/Makefile.am	2010-09-02 18:01:55.609532714 +0200
-@@ -24,23 +24,23 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/heap/Makefile.am mysql/storage/heap/Makefile.am
+--- mysql.orig/storage/heap/Makefile.am	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/heap/Makefile.am	2010-09-02 20:43:04.273663976 +0000
+@@ -24,23 +24,23 @@ INCLUDES =              -I$(top_srcdir)/
  WRAPLIBS=
  
  LDADD =
@@ -787,9 +788,9 @@ diff -ru ../mysql-5.1.50/storage/heap/Makefile.am ./storage/heap/Makefile.am
  			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
  			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
  			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
-diff -ru ../mysql-5.1.50/storage/heap/plug.in ./storage/heap/plug.in
---- ../mysql-5.1.50/storage/heap/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/heap/plug.in	2010-09-02 18:01:55.609532714 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/heap/plug.in mysql/storage/heap/plug.in
+--- mysql.orig/storage/heap/plug.in	2010-09-02 20:38:44.064339040 +0000
++++ mysql/storage/heap/plug.in	2010-09-02 20:43:04.273663976 +0000
 @@ -1,7 +1,5 @@
  MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],
          [Volatile memory based tables])
@@ -799,10 +800,10 @@ diff -ru ../mysql-5.1.50/storage/heap/plug.in ./storage/heap/plug.in
 +MYSQL_PLUGIN_DYNAMIC(heap,      [libheap.la])
  MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc])
 -
-diff -ru ../mysql-5.1.50/storage/ibmdb2i/Makefile.am ./storage/ibmdb2i/Makefile.am
---- ../mysql-5.1.50/storage/ibmdb2i/Makefile.am	2010-08-03 19:24:22.000000000 +0200
-+++ ./storage/ibmdb2i/Makefile.am	2010-09-02 18:01:55.610540304 +0200
-@@ -21,6 +21,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ibmdb2i/Makefile.am mysql/storage/ibmdb2i/Makefile.am
+--- mysql.orig/storage/ibmdb2i/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ibmdb2i/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -21,6 +21,7 @@ INCLUDES =              -I$(top_srcdir)/
  WRAPLIBS=
  
  LDADD =			
@@ -810,10 +811,10 @@ diff -ru ../mysql-5.1.50/storage/ibmdb2i/Makefile.am ./storage/ibmdb2i/Makefile.
  
  DEFS =                  @DEFS@
  
-diff -ru ../mysql-5.1.50/storage/innobase/Makefile.am ./storage/innobase/Makefile.am
---- ../mysql-5.1.50/storage/innobase/Makefile.am	2010-08-03 19:24:20.000000000 +0200
-+++ ./storage/innobase/Makefile.am	2010-09-02 18:01:55.611577200 +0200
-@@ -122,9 +122,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/innobase/Makefile.am mysql/storage/innobase/Makefile.am
+--- mysql.orig/storage/innobase/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/innobase/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -122,9 +122,9 @@ noinst_HEADERS=		include/btr0btr.h inclu
  			include/ut0list.ic include/ut0wqueue.h		\
  			include/ha_prototypes.h handler/ha_innodb.h
  
@@ -826,7 +827,7 @@ diff -ru ../mysql-5.1.50/storage/innobase/Makefile.am ./storage/innobase/Makefil
  			btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c	\
  			buf/buf0lru.c buf/buf0rea.c data/data0data.c	\
  			data/data0type.c dict/dict0boot.c		\
-@@ -156,10 +156,9 @@
+@@ -156,10 +156,9 @@ libinnobase_a_SOURCES=	btr/btr0btr.c btr
  			ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c		\
  			handler/ha_innodb.cc
  
@@ -839,9 +840,9 @@ diff -ru ../mysql-5.1.50/storage/innobase/Makefile.am ./storage/innobase/Makefil
  pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
  
  ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
-diff -ru ../mysql-5.1.50/storage/innobase/plug.in ./storage/innobase/plug.in
---- ../mysql-5.1.50/storage/innobase/plug.in	2010-08-03 19:24:20.000000000 +0200
-+++ ./storage/innobase/plug.in	2010-09-02 18:01:55.612551749 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/innobase/plug.in mysql/storage/innobase/plug.in
+--- mysql.orig/storage/innobase/plug.in	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/innobase/plug.in	2010-09-02 20:43:04.276997427 +0000
 @@ -1,8 +1,8 @@
  MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
          [Transactional Tables using InnoDB], [max,max-no-ndb])
@@ -853,10 +854,10 @@ diff -ru ../mysql-5.1.50/storage/innobase/plug.in ./storage/innobase/plug.in
  MYSQL_PLUGIN_ACTIONS(innobase,  [
    AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
    AC_SUBST(innodb_system_libs)
-diff -ru ../mysql-5.1.50/storage/myisam/Makefile.am ./storage/myisam/Makefile.am
---- ../mysql-5.1.50/storage/myisam/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/myisam/Makefile.am	2010-09-02 18:01:55.613563474 +0200
-@@ -20,70 +20,38 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/myisam/Makefile.am mysql/storage/myisam/Makefile.am
+--- mysql.orig/storage/myisam/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/myisam/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -20,70 +20,38 @@ MYSQLLIBdir=            $(pkglibdir)
  INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
  			-I$(top_srcdir)/regex \
  			-I$(top_srcdir)/sql \
@@ -946,9 +947,9 @@ diff -ru ../mysql-5.1.50/storage/myisam/Makefile.am ./storage/myisam/Makefile.am
  			mi_rnext.c mi_rnext_same.c \
  			mi_search.c mi_page.c mi_key.c mi_locking.c \
  			mi_rrnd.c mi_scan.c mi_cache.c \
-diff -ru ../mysql-5.1.50/storage/myisam/plug.in ./storage/myisam/plug.in
---- ../mysql-5.1.50/storage/myisam/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/myisam/plug.in	2010-09-02 20:12:23.810456773 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/myisam/plug.in mysql/storage/myisam/plug.in
+--- mysql.orig/storage/myisam/plug.in	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/myisam/plug.in	2010-09-02 20:43:04.276997427 +0000
 @@ -1,7 +1,5 @@
  MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
          [Traditional non-transactional MySQL tables])
@@ -958,10 +959,10 @@ diff -ru ../mysql-5.1.50/storage/myisam/plug.in ./storage/myisam/plug.in
 +MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.la])
  MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc])
 -
-diff -ru ../mysql-5.1.50/storage/myisammrg/Makefile.am ./storage/myisammrg/Makefile.am
---- ../mysql-5.1.50/storage/myisammrg/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/myisammrg/Makefile.am	2010-09-02 18:01:55.615574811 +0200
-@@ -20,16 +20,16 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/myisammrg/Makefile.am mysql/storage/myisammrg/Makefile.am
+--- mysql.orig/storage/myisammrg/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/myisammrg/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -20,16 +20,16 @@ MYSQLLIBdir=            $(pkglibdir)
  INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
  			-I$(top_srcdir)/regex \
  			-I$(top_srcdir)/sql \
@@ -982,9 +983,9 @@ diff -ru ../mysql-5.1.50/storage/myisammrg/Makefile.am ./storage/myisammrg/Makef
  			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
  			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
  			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
-diff -ru ../mysql-5.1.50/storage/myisammrg/plug.in ./storage/myisammrg/plug.in
---- ../mysql-5.1.50/storage/myisammrg/plug.in	2010-08-03 19:24:32.000000000 +0200
-+++ ./storage/myisammrg/plug.in	2010-09-02 18:01:55.616586550 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/myisammrg/plug.in mysql/storage/myisammrg/plug.in
+--- mysql.orig/storage/myisammrg/plug.in	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/myisammrg/plug.in	2010-09-02 20:43:04.276997427 +0000
 @@ -1,6 +1,5 @@
  MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
          [Merge multiple MySQL tables into one])
@@ -993,9 +994,9 @@ diff -ru ../mysql-5.1.50/storage/myisammrg/plug.in ./storage/myisammrg/plug.in
 -MYSQL_PLUGIN_MANDATORY(myisammrg)
 +MYSQL_PLUGIN_DYNAMIC(myisammrg,  [libmyisammrg.la])
  MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc])
-diff -ru ../mysql-5.1.50/storage/ndb/config/type_ndbapitest.mk.am ./storage/ndb/config/type_ndbapitest.mk.am
---- ../mysql-5.1.50/storage/ndb/config/type_ndbapitest.mk.am	2010-08-03 19:24:36.000000000 +0200
-+++ ./storage/ndb/config/type_ndbapitest.mk.am	2010-09-02 18:01:55.616586550 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/config/type_ndbapitest.mk.am mysql/storage/ndb/config/type_ndbapitest.mk.am
+--- mysql.orig/storage/ndb/config/type_ndbapitest.mk.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/config/type_ndbapitest.mk.am	2010-09-02 20:43:04.276997427 +0000
 @@ -15,9 +15,9 @@
  
  LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
@@ -1009,9 +1010,9 @@ diff -ru ../mysql-5.1.50/storage/ndb/config/type_ndbapitest.mk.am ./storage/ndb/
  
  INCLUDES += -I$(top_srcdir) \
  	-I$(top_builddir)/include \
-diff -ru ../mysql-5.1.50/storage/ndb/config/type_ndbapitools.mk.am ./storage/ndb/config/type_ndbapitools.mk.am
---- ../mysql-5.1.50/storage/ndb/config/type_ndbapitools.mk.am	2010-08-03 19:24:36.000000000 +0200
-+++ ./storage/ndb/config/type_ndbapitools.mk.am	2010-09-02 18:01:55.617598066 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/config/type_ndbapitools.mk.am mysql/storage/ndb/config/type_ndbapitools.mk.am
+--- mysql.orig/storage/ndb/config/type_ndbapitools.mk.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/config/type_ndbapitools.mk.am	2010-09-02 20:43:04.276997427 +0000
 @@ -15,9 +15,9 @@
  
  LDADD += \
@@ -1025,10 +1026,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/config/type_ndbapitools.mk.am ./storage/ndb
  
  INCLUDES += -I$(srcdir) \
  	-I$(top_builddir)/include \
-diff -ru ../mysql-5.1.50/storage/ndb/config/win-libraries ./storage/ndb/config/win-libraries
---- ../mysql-5.1.50/storage/ndb/config/win-libraries	2010-08-03 19:24:36.000000000 +0200
-+++ ./storage/ndb/config/win-libraries	2010-09-02 18:01:55.618609704 +0200
-@@ -21,7 +21,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/config/win-libraries mysql/storage/ndb/config/win-libraries
+--- mysql.orig/storage/ndb/config/win-libraries	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/config/win-libraries	2010-09-02 20:43:04.276997427 +0000
+@@ -21,7 +21,7 @@ do
  # the same goes for mysys and strings
    lib=$i
    case $i in
@@ -1037,10 +1038,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/config/win-libraries ./storage/ndb/config/w
    lib=`echo $i | sed s'!dbug\/lib!!' | sed 's!mysys\/lib!!' | sed 's!strings\/libmy!!'`
    echo "Changing from $i to $lib"
    ;;
-diff -ru ../mysql-5.1.50/storage/ndb/src/common/util/Makefile.am ./storage/ndb/src/common/util/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/common/util/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/common/util/Makefile.am	2010-09-02 18:01:55.618609704 +0200
-@@ -31,9 +31,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/common/util/Makefile.am mysql/storage/ndb/src/common/util/Makefile.am
+--- mysql.orig/storage/ndb/src/common/util/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/common/util/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -31,9 +31,9 @@ EXTRA_PROGRAMS = testBitmask
  testBitmask_SOURCES =  testBitmask.cpp
  testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1053,10 +1054,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/common/util/Makefile.am ./storage/ndb/s
  
  testBitmask.cpp : Bitmask.cpp
  	rm -f testBitmask.cpp
-diff -ru ../mysql-5.1.50/storage/ndb/src/cw/cpcd/Makefile.am ./storage/ndb/src/cw/cpcd/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/cw/cpcd/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/cw/cpcd/Makefile.am	2010-09-02 18:01:55.619617543 +0200
-@@ -19,9 +19,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/cw/cpcd/Makefile.am mysql/storage/ndb/src/cw/cpcd/Makefile.am
+--- mysql.orig/storage/ndb/src/cw/cpcd/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/cw/cpcd/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -19,9 +19,9 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro
  
  LDADD_LOC = \
              $(top_builddir)/storage/ndb/src/libndbclient.la      \
@@ -1069,10 +1070,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/cw/cpcd/Makefile.am ./storage/ndb/src/c
  
  include $(top_srcdir)/storage/ndb/config/common.mk.am
  include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/backup/Makefile.am ./storage/ndb/src/kernel/blocks/backup/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-09-02 18:01:55.620629210 +0200
-@@ -17,9 +17,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/backup/Makefile.am mysql/storage/ndb/src/kernel/blocks/backup/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_backup_fil
  ndb_print_backup_file_SOURCES = read.cpp
  ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1085,10 +1086,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/backup/Makefile.am ./stor
  
  include $(top_srcdir)/storage/ndb/config/common.mk.am
  include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdict/Makefile.am ./storage/ndb/src/kernel/blocks/dbdict/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-09-02 18:01:55.621640641 +0200
-@@ -19,17 +19,17 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/dbdict/Makefile.am mysql/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -19,17 +19,17 @@ include $(top_srcdir)/storage/ndb/config
  LDADD +=  \
           $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
           $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
@@ -1112,10 +1113,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdict/Makefile.am ./stor
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdih/Makefile.am ./storage/ndb/src/kernel/blocks/dbdih/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-09-02 18:01:55.621640641 +0200
-@@ -17,9 +17,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/dbdih/Makefile.am mysql/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_sys_file
  ndb_print_sys_file_SOURCES = printSysfile.cpp
  ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1128,10 +1129,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdih/Makefile.am ./stora
  
  
  include $(top_srcdir)/storage/ndb/config/common.mk.am
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dblqh/Makefile.am ./storage/ndb/src/kernel/blocks/dblqh/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-09-02 18:01:55.622665370 +0200
-@@ -23,9 +23,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/dblqh/Makefile.am mysql/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -23,9 +23,9 @@ include $(top_srcdir)/storage/ndb/config
  
  ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1144,10 +1145,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dblqh/Makefile.am ./stora
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbtup/Makefile.am ./storage/ndb/src/kernel/blocks/dbtup/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-09-02 18:01:55.623660008 +0200
-@@ -20,9 +20,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/dbtup/Makefile.am mysql/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -20,9 +20,9 @@ EXTRA_PROGRAMS = test_varpage
  test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
  test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1160,10 +1161,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbtup/Makefile.am ./stora
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/Makefile.am ./storage/ndb/src/kernel/blocks/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/blocks/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/blocks/Makefile.am	2010-09-02 18:01:55.624671940 +0200
-@@ -57,9 +57,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/blocks/Makefile.am mysql/storage/ndb/src/kernel/blocks/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/blocks/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/blocks/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -57,9 +57,9 @@ EXTRA_PROGRAMS = ndb_print_file
  ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
  ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1176,10 +1177,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/blocks/Makefile.am ./storage/ndb
  
  include $(top_srcdir)/storage/ndb/config/common.mk.am
  include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/Makefile.am ./storage/ndb/src/kernel/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/Makefile.am	2010-09-02 18:01:55.624671940 +0200
-@@ -53,9 +53,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/Makefile.am mysql/storage/ndb/src/kernel/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/Makefile.am	2010-09-02 20:38:44.067672494 +0000
++++ mysql/storage/ndb/src/kernel/Makefile.am	2010-09-02 20:43:04.276997427 +0000
+@@ -53,9 +53,9 @@ LDADD +=  \
                $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
                $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la      \
                $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
@@ -1192,10 +1193,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/Makefile.am ./storage/ndb/src/ke
  
  windoze-dsp: ndbd.dsp
  
-diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/vm/Makefile.am ./storage/ndb/src/kernel/vm/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/kernel/vm/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/kernel/vm/Makefile.am	2010-09-02 18:01:55.625688747 +0200
-@@ -65,24 +65,24 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/kernel/vm/Makefile.am mysql/storage/ndb/src/kernel/vm/Makefile.am
+--- mysql.orig/storage/ndb/src/kernel/vm/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/storage/ndb/src/kernel/vm/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -65,24 +65,24 @@ ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_
  ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
  ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1229,10 +1230,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/kernel/vm/Makefile.am ./storage/ndb/src
 +  $(top_builddir)/dbug/libdbug.la \
 +  $(top_builddir)/strings/libmystrings.la
  
-diff -ru ../mysql-5.1.50/storage/ndb/src/mgmclient/Makefile.am ./storage/ndb/src/mgmclient/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/mgmclient/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/mgmclient/Makefile.am	2010-09-02 18:01:55.626694929 +0200
-@@ -37,9 +37,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/mgmclient/Makefile.am mysql/storage/ndb/src/mgmclient/Makefile.am
+--- mysql.orig/storage/ndb/src/mgmclient/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/storage/ndb/src/mgmclient/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -37,9 +37,9 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \
  	    ../common/portlib/libportlib.la \
              @readline_link@ \
              $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1245,10 +1246,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/mgmclient/Makefile.am ./storage/ndb/src
              @TERMCAP_LIB@ @NDB_SCI_LIBS@
  
  ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
-diff -ru ../mysql-5.1.50/storage/ndb/src/mgmsrv/Makefile.am ./storage/ndb/src/mgmsrv/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/mgmsrv/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/mgmsrv/Makefile.am	2010-09-02 18:01:55.627702947 +0200
-@@ -40,9 +40,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/mgmsrv/Makefile.am mysql/storage/ndb/src/mgmsrv/Makefile.am
+--- mysql.orig/storage/ndb/src/mgmsrv/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/storage/ndb/src/mgmsrv/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -40,9 +40,9 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n
  
  LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
              $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1261,10 +1262,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/mgmsrv/Makefile.am ./storage/ndb/src/mg
              @readline_link@ \
              @NDB_SCI_LIBS@ \
  	    @TERMCAP_LIB@
-diff -ru ../mysql-5.1.50/storage/ndb/src/ndbapi/Makefile.am ./storage/ndb/src/ndbapi/Makefile.am
---- ../mysql-5.1.50/storage/ndb/src/ndbapi/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/src/ndbapi/Makefile.am	2010-09-02 18:01:55.627702947 +0200
-@@ -67,9 +67,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/src/ndbapi/Makefile.am mysql/storage/ndb/src/ndbapi/Makefile.am
+--- mysql.orig/storage/ndb/src/ndbapi/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/storage/ndb/src/ndbapi/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -67,9 +67,9 @@ include $(top_srcdir)/storage/ndb/config
  include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
  
  ndberror_check_LDFLAGS = \
@@ -1277,10 +1278,10 @@ diff -ru ../mysql-5.1.50/storage/ndb/src/ndbapi/Makefile.am ./storage/ndb/src/nd
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
-diff -ru ../mysql-5.1.50/storage/ndb/test/run-test/Makefile.am ./storage/ndb/test/run-test/Makefile.am
---- ../mysql-5.1.50/storage/ndb/test/run-test/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./storage/ndb/test/run-test/Makefile.am	2010-09-02 18:01:55.628714348 +0200
-@@ -34,9 +34,9 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/storage/ndb/test/run-test/Makefile.am mysql/storage/ndb/test/run-test/Makefile.am
+--- mysql.orig/storage/ndb/test/run-test/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/storage/ndb/test/run-test/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -34,9 +34,9 @@ atrt_SOURCES = main.cpp setup.cpp files.
  INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
  LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
  	    $(top_builddir)/storage/ndb/src/libndbclient.la \
@@ -1293,9 +1294,9 @@ diff -ru ../mysql-5.1.50/storage/ndb/test/run-test/Makefile.am ./storage/ndb/tes
  
  atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
                        -I$(top_srcdir)/ndb/src/mgmsrv \
-diff -ru ../mysql-5.1.50/strings/Makefile.am ./strings/Makefile.am
---- ../mysql-5.1.50/strings/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./strings/Makefile.am	2010-09-02 18:01:55.629726056 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/strings/Makefile.am mysql/strings/Makefile.am
+--- mysql.orig/strings/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/strings/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -16,7 +16,7 @@
  # This file is public domain and comes with NO WARRANTY of any kind
  
@@ -1305,7 +1306,7 @@ diff -ru ../mysql-5.1.50/strings/Makefile.am ./strings/Makefile.am
  
  # Exact one of ASSEMBLER_X
  if ASSEMBLER_x86
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ CSRCS		= strxmov.c bmove_upp.c strappend
  endif
  endif
  
@@ -1314,7 +1315,7 @@ diff -ru ../mysql-5.1.50/strings/Makefile.am ./strings/Makefile.am
  noinst_PROGRAMS = conf_to_src
  CLEANFILES = str_test uctypedump test_decimal
  # Default charset definitions
-@@ -56,28 +56,27 @@
+@@ -56,28 +56,27 @@ EXTRA_DIST =		ctype-big5.c ctype-cp932.c
  			t_ctype.h my_strchr.c CMakeLists.txt \
  			CHARSET_INFO.txt
  
@@ -1351,10 +1352,10 @@ diff -ru ../mysql-5.1.50/strings/Makefile.am ./strings/Makefile.am
  	$(RM) -f ./test_decimal.c
  
  # Don't update the files from bitkeeper
-diff -ru ../mysql-5.1.50/strings/strings-x86.s ./strings/strings-x86.s
---- ../mysql-5.1.50/strings/strings-x86.s	2010-08-03 19:24:35.000000000 +0200
-+++ ./strings/strings-x86.s	2010-09-02 18:01:55.630733621 +0200
-@@ -293,7 +293,7 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/strings/strings-x86.s mysql/strings/strings-x86.s
+--- mysql.orig/strings/strings-x86.s	2010-09-02 20:38:44.071005946 +0000
++++ mysql/strings/strings-x86.s	2010-09-02 20:43:04.280330881 +0000
+@@ -293,7 +293,7 @@ strinstr:
  	movl	%esp,%ebp
  	pushl	12(%ebp)		#  search
  	pushl	8(%ebp)			#  str
@@ -1363,10 +1364,10 @@ diff -ru ../mysql-5.1.50/strings/strings-x86.s ./strings/strings-x86.s
  	add	$8,%esp
  	or	%eax,%eax
  	jz	si_99			#  Not found, return NULL
-diff -ru ../mysql-5.1.50/tests/Makefile.am ./tests/Makefile.am
---- ../mysql-5.1.50/tests/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./tests/Makefile.am	2010-09-02 18:01:55.631741462 +0200
-@@ -49,11 +49,11 @@
+diff -Nuarp --exclude '*.orig' mysql.orig/tests/Makefile.am mysql/tests/Makefile.am
+--- mysql.orig/tests/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/tests/Makefile.am	2010-09-02 20:43:04.280330881 +0000
+@@ -49,11 +49,11 @@ mysql_client_test_SOURCES= mysql_client_
  
  insert_test_SOURCES=       insert_test.c
  select_test_SOURCES=       select_test.c
@@ -1381,9 +1382,9 @@ diff -ru ../mysql-5.1.50/tests/Makefile.am ./tests/Makefile.am
  
  # Fix for mit-threads
  DEFS =			-DMYSQL_CLIENT_NO_THREADS
-diff -ru ../mysql-5.1.50/unittest/examples/Makefile.am ./unittest/examples/Makefile.am
---- ../mysql-5.1.50/unittest/examples/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./unittest/examples/Makefile.am	2010-09-02 18:01:55.631741462 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/unittest/examples/Makefile.am mysql/unittest/examples/Makefile.am
+--- mysql.orig/unittest/examples/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/unittest/examples/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -16,9 +16,7 @@
  AM_CPPFLAGS        = -I$(srcdir) -I$(top_builddir)/include \
  		     -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
@@ -1395,9 +1396,9 @@ diff -ru ../mysql-5.1.50/unittest/examples/Makefile.am ./unittest/examples/Makef
  
  # We omit core-t here, since it will always fail.
  noinst_PROGRAMS    = simple-t skip-t todo-t skip_all-t no_plan-t
-diff -ru ../mysql-5.1.50/unittest/mysys/Makefile.am ./unittest/mysys/Makefile.am
---- ../mysql-5.1.50/unittest/mysys/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./unittest/mysys/Makefile.am	2010-09-02 18:01:55.632770771 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/unittest/mysys/Makefile.am mysql/unittest/mysys/Makefile.am
+--- mysql.orig/unittest/mysys/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/unittest/mysys/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -16,10 +16,10 @@
  AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
  AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
@@ -1413,9 +1414,9 @@ diff -ru ../mysql-5.1.50/unittest/mysys/Makefile.am ./unittest/mysys/Makefile.am
  
  noinst_PROGRAMS  = bitmap-t base64-t
  
-diff -ru ../mysql-5.1.50/unittest/mytap/Makefile.am ./unittest/mytap/Makefile.am
---- ../mysql-5.1.50/unittest/mytap/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./unittest/mytap/Makefile.am	2010-09-02 18:01:55.641763230 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/unittest/mytap/Makefile.am mysql/unittest/mytap/Makefile.am
+--- mysql.orig/unittest/mytap/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/unittest/mytap/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -15,10 +15,10 @@
  
  AM_CPPFLAGS  = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
@@ -1429,9 +1430,9 @@ diff -ru ../mysql-5.1.50/unittest/mytap/Makefile.am ./unittest/mytap/Makefile.am
  
  SUBDIRS            = . t
  
-diff -ru ../mysql-5.1.50/unittest/mytap/t/Makefile.am ./unittest/mytap/t/Makefile.am
---- ../mysql-5.1.50/unittest/mytap/t/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./unittest/mytap/t/Makefile.am	2010-09-02 18:01:55.642763157 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/unittest/mytap/t/Makefile.am mysql/unittest/mytap/t/Makefile.am
+--- mysql.orig/unittest/mytap/t/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/unittest/mytap/t/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -15,9 +15,7 @@
  
  AM_CPPFLAGS     = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include
@@ -1443,9 +1444,9 @@ diff -ru ../mysql-5.1.50/unittest/mytap/t/Makefile.am ./unittest/mytap/t/Makefil
  
  noinst_PROGRAMS = basic-t
  
-diff -ru ../mysql-5.1.50/unittest/strings/Makefile.am ./unittest/strings/Makefile.am
---- ../mysql-5.1.50/unittest/strings/Makefile.am	2010-08-03 19:24:22.000000000 +0200
-+++ ./unittest/strings/Makefile.am	2010-09-02 18:01:55.644768429 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/unittest/strings/Makefile.am mysql/unittest/strings/Makefile.am
+--- mysql.orig/unittest/strings/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/unittest/strings/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -16,10 +16,10 @@
  AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
  AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
@@ -1461,27 +1462,9 @@ diff -ru ../mysql-5.1.50/unittest/strings/Makefile.am ./unittest/strings/Makefil
  
  noinst_PROGRAMS  = strings-t
  
-diff -ru ../mysql-5.1.50/vio/Makefile.am ./vio/Makefile.am
---- ../mysql-5.1.50/vio/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./vio/Makefile.am	2010-09-02 18:01:55.649771898 +0200
-@@ -16,11 +16,12 @@
- INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
- 			$(openssl_includes)
- LDADD =			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
--pkglib_LIBRARIES =	libvio.a
-+pkglib_LTLIBRARIES =	libvio.la
- 
- noinst_HEADERS =	vio_priv.h
- 
--libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
-+libvio_la_LIBADD = -lssl
-+libvio_la_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
- 
- EXTRA_DIST=		CMakeLists.txt
- 
-diff -ru ../mysql-5.1.50/vio/Makefile.am ./vio/Makefile.am
---- ../mysql-5.1.50/vio/Makefile.am	2010-08-03 19:24:29.000000000 +0200
-+++ ./vio/Makefile.am	2010-09-02 18:01:55.649771898 +0200
+diff -Nuarp --exclude '*.orig' mysql.orig/vio/Makefile.am mysql/vio/Makefile.am
+--- mysql.orig/vio/Makefile.am	2010-09-02 20:38:44.071005946 +0000
++++ mysql/vio/Makefile.am	2010-09-02 20:43:04.280330881 +0000
 @@ -16,11 +16,12 @@
  INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
  			$(openssl_includes)