[Pkg-mysql-commits] r1155 - in trunk: . debian/patches

Monty Taylor mtaylor-guest at alioth.debian.org
Wed Feb 20 15:18:26 UTC 2008


Author: mtaylor-guest
Date: 2008-02-20 15:18:26 +0000 (Wed, 20 Feb 2008)
New Revision: 1155

Modified:
   trunk/
   trunk/debian/patches/88_sphinx_se.dpatch
Log:
Updated sphinx patch to 1112.



Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-02-18 15:42:24.339999914 -0300
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2008-02-18 16:13:19.621999979 -0300
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:file-ids
   - debian/patches/60_raise-max-keylength.dpatch	1135 at bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:debian%2Fpatches%2F60_raise-max-keylength.dpatch
debian/patches/51_incorrect-order.dpatch	1138 at bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:debian%2Fpatches%2F51_incorrect-order.dpatch

   + 
Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx


Modified: trunk/debian/patches/88_sphinx_se.dpatch
===================================================================
--- trunk/debian/patches/88_sphinx_se.dpatch	2008-02-20 15:18:20 UTC (rev 1154)
+++ trunk/debian/patches/88_sphinx_se.dpatch	2008-02-20 15:18:26 UTC (rev 1155)
@@ -5,9 +5,9 @@
 ## DP: Add Sphinx Storage Engine
 
 @DPATCH@
-diff -urNad trunk~/BUILD/Makefile.in trunk/BUILD/Makefile.in
---- trunk~/BUILD/Makefile.in	2007-11-15 08:08:10.000000000 -0600
-+++ trunk/BUILD/Makefile.in	2007-12-27 15:54:48.310207924 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/BUILD/Makefile.in mysql-dfsg-5.0-5.0.51a/BUILD/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/BUILD/Makefile.in	2008-01-11 12:45:17.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/BUILD/Makefile.in	2008-02-18 16:10:29.474655366 -0300
 @@ -64,6 +64,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -16,9 +16,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/Docs/Makefile.in trunk/Docs/Makefile.in
---- trunk~/Docs/Makefile.in	2007-12-27 15:54:27.621028915 -0600
-+++ trunk/Docs/Makefile.in	2007-12-27 15:54:48.310207924 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/Docs/Makefile.in mysql-dfsg-5.0-5.0.51a/Docs/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/Docs/Makefile.in	2008-02-18 16:09:46.574290254 -0300
++++ mysql-dfsg-5.0-5.0.51a/Docs/Makefile.in	2008-02-18 16:10:29.474655366 -0300
 @@ -828,6 +828,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -27,9 +27,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2007-11-15 08:08:52.000000000 -0600
-+++ trunk/Makefile.in	2007-12-27 15:54:48.310207924 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/Makefile.in mysql-dfsg-5.0-5.0.51a/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/Makefile.in	2008-01-11 12:46:29.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/Makefile.in	2008-02-18 16:10:29.474655366 -0300
 @@ -67,6 +67,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -38,9 +38,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/SSL/Makefile.in trunk/SSL/Makefile.in
---- trunk~/SSL/Makefile.in	2007-11-15 08:08:10.000000000 -0600
-+++ trunk/SSL/Makefile.in	2007-12-27 15:54:48.314208152 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/SSL/Makefile.in mysql-dfsg-5.0-5.0.51a/SSL/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/SSL/Makefile.in	2008-01-11 12:45:18.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/SSL/Makefile.in	2008-02-18 16:10:29.518655740 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -49,9 +49,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/client/Makefile.in trunk/client/Makefile.in
---- trunk~/client/Makefile.in	2007-11-15 08:08:11.000000000 -0600
-+++ trunk/client/Makefile.in	2007-12-27 15:54:48.314208152 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/client/Makefile.in mysql-dfsg-5.0-5.0.51a/client/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/client/Makefile.in	2008-01-11 12:45:19.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/client/Makefile.in	2008-02-18 16:10:29.666657000 -0300
 @@ -71,6 +71,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -60,9 +60,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/cmd-line-utils/Makefile.in trunk/cmd-line-utils/Makefile.in
---- trunk~/cmd-line-utils/Makefile.in	2007-11-15 08:08:11.000000000 -0600
-+++ trunk/cmd-line-utils/Makefile.in	2007-12-27 15:54:48.314208152 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/Makefile.in mysql-dfsg-5.0-5.0.51a/cmd-line-utils/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/Makefile.in	2008-01-11 12:45:20.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/cmd-line-utils/Makefile.in	2008-02-18 16:10:29.666657000 -0300
 @@ -64,6 +64,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -71,9 +71,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/cmd-line-utils/libedit/Makefile.in trunk/cmd-line-utils/libedit/Makefile.in
---- trunk~/cmd-line-utils/libedit/Makefile.in	2007-11-15 08:08:12.000000000 -0600
-+++ trunk/cmd-line-utils/libedit/Makefile.in	2007-12-27 15:54:48.738232316 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/libedit/Makefile.in mysql-dfsg-5.0-5.0.51a/cmd-line-utils/libedit/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/libedit/Makefile.in	2008-01-11 12:45:21.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/cmd-line-utils/libedit/Makefile.in	2008-02-18 16:10:29.666657000 -0300
 @@ -53,6 +53,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -82,9 +82,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/cmd-line-utils/readline/Makefile.in trunk/cmd-line-utils/readline/Makefile.in
---- trunk~/cmd-line-utils/readline/Makefile.in	2007-11-15 08:08:13.000000000 -0600
-+++ trunk/cmd-line-utils/readline/Makefile.in	2007-12-27 15:54:48.738232316 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/readline/Makefile.in mysql-dfsg-5.0-5.0.51a/cmd-line-utils/readline/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/cmd-line-utils/readline/Makefile.in	2008-01-11 12:45:23.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/cmd-line-utils/readline/Makefile.in	2008-02-18 16:10:29.666657000 -0300
 @@ -53,6 +53,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -93,9 +93,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/config/ac-macros/ha_sphinx.m4 trunk/config/ac-macros/ha_sphinx.m4
---- trunk~/config/ac-macros/ha_sphinx.m4	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/config/ac-macros/ha_sphinx.m4	2007-12-27 15:54:48.738232316 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/config/ac-macros/ha_sphinx.m4 mysql-dfsg-5.0-5.0.51a/config/ac-macros/ha_sphinx.m4
+--- mysql-dfsg-5.0-5.0.51a~/config/ac-macros/ha_sphinx.m4	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/config/ac-macros/ha_sphinx.m4	2008-02-18 16:10:29.666657000 -0300
 @@ -0,0 +1,30 @@
 +dnl ---------------------------------------------------------------------------
 +dnl Macro: MYSQL_CHECK_EXAMPLEDB
@@ -127,9 +127,9 @@
 +dnl END OF MYSQL_CHECK_EXAMPLE SECTION
 +dnl ---------------------------------------------------------------------------
 +
-diff -urNad trunk~/config.h.in trunk/config.h.in
---- trunk~/config.h.in	2007-11-15 08:08:03.000000000 -0600
-+++ trunk/config.h.in	2007-12-27 15:54:48.738232316 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/config.h.in mysql-dfsg-5.0-5.0.51a/config.h.in
+--- mysql-dfsg-5.0-5.0.51a~/config.h.in	2008-01-11 12:44:42.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/config.h.in	2008-02-18 16:10:29.666657000 -0300
 @@ -703,6 +703,9 @@
  /* Spatial extentions */
  #undef HAVE_SPATIAL
@@ -140,9 +140,9 @@
  /* Define to 1 if you have the <stdarg.h> header file. */
  #undef HAVE_STDARG_H
  
-diff -urNad trunk~/configure trunk/configure
---- trunk~/configure	2007-11-15 08:08:54.000000000 -0600
-+++ trunk/configure	2007-12-27 15:54:48.750232999 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/configure mysql-dfsg-5.0-5.0.51a/configure
+--- mysql-dfsg-5.0-5.0.51a~/configure	2008-01-11 12:46:32.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/configure	2008-02-18 16:10:29.698657272 -0300
 @@ -1165,6 +1165,9 @@
    --with-example-storage-engine
                            Enable the Example Storage Engine
@@ -199,9 +199,9 @@
  
  
  # Check whether --with-archive-storage-engine or --without-archive-storage-engine was given.
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in	2007-11-15 08:06:32.000000000 -0600
-+++ trunk/configure.in	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/configure.in mysql-dfsg-5.0-5.0.51a/configure.in
+--- mysql-dfsg-5.0-5.0.51a~/configure.in	2008-01-11 12:43:23.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/configure.in	2008-02-18 16:10:29.706657341 -0300
 @@ -48,6 +48,7 @@
  sinclude(config/ac-macros/ha_berkeley.m4)
  sinclude(config/ac-macros/ha_blackhole.m4)
@@ -218,9 +218,9 @@
  MYSQL_CHECK_ARCHIVEDB
  MYSQL_CHECK_CSVDB
  MYSQL_CHECK_BLACKHOLEDB
-diff -urNad trunk~/configure.in.orig trunk/configure.in.orig
---- trunk~/configure.in.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/configure.in.orig	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/configure.in.orig mysql-dfsg-5.0-5.0.51a/configure.in.orig
+--- mysql-dfsg-5.0-5.0.51a~/configure.in.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/configure.in.orig	2008-02-18 16:10:29.706657341 -0300
 @@ -0,0 +1,3019 @@
 +dnl -*- ksh -*-
 +dnl Process this file with autoconf to produce a configure script.
@@ -3241,9 +3241,9 @@
 +# ended sucessfully - don't remove it.
 +echo "Thank you for choosing MySQL!"
 +echo
-diff -urNad trunk~/dbug/Makefile.in trunk/dbug/Makefile.in
---- trunk~/dbug/Makefile.in	2007-11-15 08:08:13.000000000 -0600
-+++ trunk/dbug/Makefile.in	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/dbug/Makefile.in mysql-dfsg-5.0-5.0.51a/dbug/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/dbug/Makefile.in	2008-01-11 12:45:24.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/dbug/Makefile.in	2008-02-18 16:10:29.714657409 -0300
 @@ -69,6 +69,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3252,9 +3252,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/Makefile.in trunk/extra/Makefile.in
---- trunk~/extra/Makefile.in	2007-11-15 08:08:14.000000000 -0600
-+++ trunk/extra/Makefile.in	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/Makefile.in	2008-01-11 12:45:25.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/Makefile.in	2008-02-18 16:10:29.714657409 -0300
 @@ -70,6 +70,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3263,9 +3263,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/Makefile.in trunk/extra/yassl/Makefile.in
---- trunk~/extra/yassl/Makefile.in	2007-11-15 08:08:14.000000000 -0600
-+++ trunk/extra/yassl/Makefile.in	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/Makefile.in	2008-01-11 12:45:25.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/Makefile.in	2008-02-18 16:10:29.714657409 -0300
 @@ -48,6 +48,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3274,9 +3274,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/src/Makefile.in trunk/extra/yassl/src/Makefile.in
---- trunk~/extra/yassl/src/Makefile.in	2007-11-15 08:08:14.000000000 -0600
-+++ trunk/extra/yassl/src/Makefile.in	2007-12-27 15:54:48.754233227 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/src/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/src/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/src/Makefile.in	2008-01-11 12:45:27.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/src/Makefile.in	2008-02-18 16:10:29.714657409 -0300
 @@ -48,6 +48,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3285,9 +3285,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/taocrypt/Makefile.in trunk/extra/yassl/taocrypt/Makefile.in
---- trunk~/extra/yassl/taocrypt/Makefile.in	2007-11-15 08:08:16.000000000 -0600
-+++ trunk/extra/yassl/taocrypt/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/Makefile.in	2008-01-11 12:45:28.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/Makefile.in	2008-02-18 16:10:29.714657409 -0300
 @@ -48,6 +48,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3296,9 +3296,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/taocrypt/benchmark/Makefile.in trunk/extra/yassl/taocrypt/benchmark/Makefile.in
---- trunk~/extra/yassl/taocrypt/benchmark/Makefile.in	2007-11-15 08:08:16.000000000 -0600
-+++ trunk/extra/yassl/taocrypt/benchmark/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/benchmark/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/benchmark/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/benchmark/Makefile.in	2008-01-11 12:45:28.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/benchmark/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -49,6 +49,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3307,9 +3307,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/taocrypt/src/Makefile.in trunk/extra/yassl/taocrypt/src/Makefile.in
---- trunk~/extra/yassl/taocrypt/src/Makefile.in	2007-11-15 08:08:17.000000000 -0600
-+++ trunk/extra/yassl/taocrypt/src/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/src/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/src/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/src/Makefile.in	2008-01-11 12:45:29.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/src/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -48,6 +48,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3318,9 +3318,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/taocrypt/test/Makefile.in trunk/extra/yassl/taocrypt/test/Makefile.in
---- trunk~/extra/yassl/taocrypt/test/Makefile.in	2007-11-15 08:08:17.000000000 -0600
-+++ trunk/extra/yassl/taocrypt/test/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/test/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/test/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/taocrypt/test/Makefile.in	2008-01-11 12:45:30.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/taocrypt/test/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -49,6 +49,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3329,9 +3329,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/extra/yassl/testsuite/Makefile.in trunk/extra/yassl/testsuite/Makefile.in
---- trunk~/extra/yassl/testsuite/Makefile.in	2007-11-15 08:08:18.000000000 -0600
-+++ trunk/extra/yassl/testsuite/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/extra/yassl/testsuite/Makefile.in mysql-dfsg-5.0-5.0.51a/extra/yassl/testsuite/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/extra/yassl/testsuite/Makefile.in	2008-01-11 12:45:31.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/extra/yassl/testsuite/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -49,6 +49,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3340,9 +3340,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/heap/Makefile.in trunk/heap/Makefile.in
---- trunk~/heap/Makefile.in	2007-11-15 08:08:18.000000000 -0600
-+++ trunk/heap/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/heap/Makefile.in mysql-dfsg-5.0-5.0.51a/heap/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/heap/Makefile.in	2008-01-11 12:45:33.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/heap/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -67,6 +67,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3351,9 +3351,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/include/Makefile.in trunk/include/Makefile.in
---- trunk~/include/Makefile.in	2007-11-15 08:08:19.000000000 -0600
-+++ trunk/include/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/include/Makefile.in mysql-dfsg-5.0-5.0.51a/include/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/include/Makefile.in	2008-01-11 12:45:34.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/include/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -67,6 +67,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3362,9 +3362,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/libmysql/Makefile.in trunk/libmysql/Makefile.in
---- trunk~/libmysql/Makefile.in	2007-11-15 08:08:19.000000000 -0600
-+++ trunk/libmysql/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/libmysql/Makefile.in mysql-dfsg-5.0-5.0.51a/libmysql/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/libmysql/Makefile.in	2008-01-11 12:45:35.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/libmysql/Makefile.in	2008-02-18 16:10:29.722657477 -0300
 @@ -97,6 +97,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3373,9 +3373,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/libmysql_r/Makefile.in trunk/libmysql_r/Makefile.in
---- trunk~/libmysql_r/Makefile.in	2007-11-15 08:08:20.000000000 -0600
-+++ trunk/libmysql_r/Makefile.in	2007-12-27 15:54:48.758233455 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/libmysql_r/Makefile.in mysql-dfsg-5.0-5.0.51a/libmysql_r/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/libmysql_r/Makefile.in	2008-01-11 12:45:35.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/libmysql_r/Makefile.in	2008-02-18 16:10:29.730657545 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3384,9 +3384,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/libmysqld/Makefile.am trunk/libmysqld/Makefile.am
---- trunk~/libmysqld/Makefile.am	2007-11-15 08:07:10.000000000 -0600
-+++ trunk/libmysqld/Makefile.am	2007-12-27 15:54:48.774234367 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/libmysqld/Makefile.am mysql-dfsg-5.0-5.0.51a/libmysqld/Makefile.am
+--- mysql-dfsg-5.0-5.0.51a~/libmysqld/Makefile.am	2008-01-11 12:43:39.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/libmysqld/Makefile.am	2008-02-18 16:10:29.730657545 -0300
 @@ -29,6 +29,7 @@
  			-I$(top_builddir)/include -I$(top_srcdir)/include \
  			-I$(top_builddir)/sql -I$(top_srcdir)/sql \
@@ -3430,9 +3430,9 @@
  	       $(top_srcdir)/linked_libmysqld_sources; \
  	rm -f client_settings.h
  
-diff -urNad trunk~/libmysqld/Makefile.in trunk/libmysqld/Makefile.in
---- trunk~/libmysqld/Makefile.in	2007-11-15 08:08:20.000000000 -0600
-+++ trunk/libmysqld/Makefile.in	2007-12-27 15:54:48.774234367 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/libmysqld/Makefile.in mysql-dfsg-5.0-5.0.51a/libmysqld/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/libmysqld/Makefile.in	2008-01-11 12:45:36.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/libmysqld/Makefile.in	2008-02-18 16:10:29.730657545 -0300
 @@ -69,6 +69,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3502,9 +3502,9 @@
  	       $(top_srcdir)/linked_libmysqld_sources; \
  	rm -f client_settings.h
  
-diff -urNad trunk~/libmysqld/examples/Makefile.in trunk/libmysqld/examples/Makefile.in
---- trunk~/libmysqld/examples/Makefile.in	2007-11-15 08:08:21.000000000 -0600
-+++ trunk/libmysqld/examples/Makefile.in	2007-12-27 15:54:48.786235051 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/libmysqld/examples/Makefile.in mysql-dfsg-5.0-5.0.51a/libmysqld/examples/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/libmysqld/examples/Makefile.in	2008-01-11 12:45:37.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/libmysqld/examples/Makefile.in	2008-02-18 16:10:29.730657545 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3513,9 +3513,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/man/Makefile.in trunk/man/Makefile.in
---- trunk~/man/Makefile.in	2007-11-15 08:08:21.000000000 -0600
-+++ trunk/man/Makefile.in	2007-12-27 15:54:48.786235051 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/man/Makefile.in mysql-dfsg-5.0-5.0.51a/man/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/man/Makefile.in	2008-01-11 12:45:37.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/man/Makefile.in	2008-02-18 16:10:29.730657545 -0300
 @@ -64,6 +64,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3524,9 +3524,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/myisam/Makefile.in trunk/myisam/Makefile.in
---- trunk~/myisam/Makefile.in	2007-11-15 08:08:22.000000000 -0600
-+++ trunk/myisam/Makefile.in	2007-12-27 15:54:48.798235735 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/myisam/Makefile.in mysql-dfsg-5.0-5.0.51a/myisam/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/myisam/Makefile.in	2008-01-11 12:45:38.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/myisam/Makefile.in	2008-02-18 16:10:29.778657953 -0300
 @@ -71,6 +71,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3535,9 +3535,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/myisammrg/Makefile.in trunk/myisammrg/Makefile.in
---- trunk~/myisammrg/Makefile.in	2007-11-15 08:08:22.000000000 -0600
-+++ trunk/myisammrg/Makefile.in	2007-12-27 15:54:48.798235735 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/myisammrg/Makefile.in mysql-dfsg-5.0-5.0.51a/myisammrg/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/myisammrg/Makefile.in	2008-01-11 12:45:39.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/myisammrg/Makefile.in	2008-02-18 16:10:29.782657987 -0300
 @@ -65,6 +65,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3546,9 +3546,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/mysql-test/Makefile.in trunk/mysql-test/Makefile.in
---- trunk~/mysql-test/Makefile.in	2007-11-15 08:08:22.000000000 -0600
-+++ trunk/mysql-test/Makefile.in	2007-12-27 15:54:48.810236419 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysql-test/Makefile.in mysql-dfsg-5.0-5.0.51a/mysql-test/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/mysql-test/Makefile.in	2008-01-11 12:45:39.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/Makefile.in	2008-02-18 16:10:29.782657987 -0300
 @@ -65,6 +65,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3557,9 +3557,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/mysql-test/ndb/Makefile.in trunk/mysql-test/ndb/Makefile.in
---- trunk~/mysql-test/ndb/Makefile.in	2007-11-15 08:08:23.000000000 -0600
-+++ trunk/mysql-test/ndb/Makefile.in	2007-12-27 15:54:48.950244397 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysql-test/ndb/Makefile.in mysql-dfsg-5.0-5.0.51a/mysql-test/ndb/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/mysql-test/ndb/Makefile.in	2008-01-11 12:45:40.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/ndb/Makefile.in	2008-02-18 16:10:29.790658055 -0300
 @@ -51,6 +51,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3568,9 +3568,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/mysql-test/r/ps_1general.result trunk/mysql-test/r/ps_1general.result
---- trunk~/mysql-test/r/ps_1general.result	2007-11-15 08:28:37.000000000 -0600
-+++ trunk/mysql-test/r/ps_1general.result	2007-12-27 15:56:06.650672293 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysql-test/r/ps_1general.result mysql-dfsg-5.0-5.0.51a/mysql-test/r/ps_1general.result
+--- mysql-dfsg-5.0-5.0.51a~/mysql-test/r/ps_1general.result	2008-01-11 13:23:40.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/r/ps_1general.result	2008-02-18 16:10:29.790658055 -0300
 @@ -329,6 +329,7 @@
  EXAMPLE	YES/NO	Example storage engine
  ARCHIVE	YES/NO	Archive storage engine
@@ -3579,9 +3579,9 @@
  ndbcluster	YES/NO	Clustered, fault-tolerant, memory-based tables
  FEDERATED	YES/NO	Federated MySQL storage engine
  MRG_MYISAM	YES/NO	Collection of identical MyISAM tables
-diff -urNad trunk~/mysys/Makefile.in trunk/mysys/Makefile.in
---- trunk~/mysys/Makefile.in	2007-11-15 08:08:23.000000000 -0600
-+++ trunk/mysys/Makefile.in	2007-12-27 15:54:48.950244397 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysys/Makefile.in mysql-dfsg-5.0-5.0.51a/mysys/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/mysys/Makefile.in	2008-01-11 12:45:41.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/mysys/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3590,9 +3590,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/Makefile.in trunk/ndb/Makefile.in
---- trunk~/ndb/Makefile.in	2007-11-15 08:08:24.000000000 -0600
-+++ trunk/ndb/Makefile.in	2007-12-27 15:54:48.954244625 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/Makefile.in	2008-01-11 12:45:42.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -78,6 +78,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3601,9 +3601,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/docs/Makefile.in trunk/ndb/docs/Makefile.in
---- trunk~/ndb/docs/Makefile.in	2007-11-15 08:08:24.000000000 -0600
-+++ trunk/ndb/docs/Makefile.in	2007-12-27 15:54:48.954244625 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/docs/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/docs/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/docs/Makefile.in	2008-01-11 12:45:42.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/docs/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -64,6 +64,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3612,9 +3612,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/include/Makefile.in trunk/ndb/include/Makefile.in
---- trunk~/ndb/include/Makefile.in	2007-11-15 08:08:24.000000000 -0600
-+++ trunk/ndb/include/Makefile.in	2007-12-27 15:54:48.954244625 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/include/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/include/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/include/Makefile.in	2008-01-11 12:45:45.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/include/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -82,6 +82,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3623,9 +3623,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/Makefile.in trunk/ndb/src/Makefile.in
---- trunk~/ndb/src/Makefile.in	2007-11-15 08:08:25.000000000 -0600
-+++ trunk/ndb/src/Makefile.in	2007-12-27 15:54:48.954244625 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/Makefile.in	2008-01-11 12:45:45.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -79,6 +79,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3634,9 +3634,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/Makefile.in trunk/ndb/src/common/Makefile.in
---- trunk~/ndb/src/common/Makefile.in	2007-11-15 08:08:25.000000000 -0600
-+++ trunk/ndb/src/common/Makefile.in	2007-12-27 15:54:48.958244853 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/Makefile.in	2008-01-11 12:45:46.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -63,6 +63,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3645,9 +3645,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/debugger/Makefile.in trunk/ndb/src/common/debugger/Makefile.in
---- trunk~/ndb/src/common/debugger/Makefile.in	2007-11-15 08:08:25.000000000 -0600
-+++ trunk/ndb/src/common/debugger/Makefile.in	2007-12-27 15:54:48.958244853 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/debugger/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/debugger/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/debugger/Makefile.in	2008-01-11 12:45:47.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/debugger/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3656,9 +3656,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/debugger/signaldata/Makefile.in trunk/ndb/src/common/debugger/signaldata/Makefile.in
---- trunk~/ndb/src/common/debugger/signaldata/Makefile.in	2007-11-15 08:08:26.000000000 -0600
-+++ trunk/ndb/src/common/debugger/signaldata/Makefile.in	2007-12-27 15:54:48.958244853 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/debugger/signaldata/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/debugger/signaldata/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/debugger/signaldata/Makefile.in	2008-01-11 12:45:48.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/debugger/signaldata/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3667,9 +3667,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/logger/Makefile.in trunk/ndb/src/common/logger/Makefile.in
---- trunk~/ndb/src/common/logger/Makefile.in	2007-11-15 08:08:26.000000000 -0600
-+++ trunk/ndb/src/common/logger/Makefile.in	2007-12-27 15:54:48.958244853 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/logger/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/logger/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/logger/Makefile.in	2008-01-11 12:45:49.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/logger/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3678,9 +3678,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/mgmcommon/Makefile.in trunk/ndb/src/common/mgmcommon/Makefile.in
---- trunk~/ndb/src/common/mgmcommon/Makefile.in	2007-11-15 08:08:26.000000000 -0600
-+++ trunk/ndb/src/common/mgmcommon/Makefile.in	2007-12-27 15:54:48.962245081 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/mgmcommon/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/mgmcommon/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/mgmcommon/Makefile.in	2008-01-11 12:45:50.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/mgmcommon/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -111,6 +111,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3689,9 +3689,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/portlib/Makefile.in trunk/ndb/src/common/portlib/Makefile.in
---- trunk~/ndb/src/common/portlib/Makefile.in	2007-11-15 08:08:27.000000000 -0600
-+++ trunk/ndb/src/common/portlib/Makefile.in	2007-12-27 15:54:48.962245081 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/portlib/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/portlib/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/portlib/Makefile.in	2008-01-11 12:45:51.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/portlib/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -97,6 +97,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3700,9 +3700,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/transporter/Makefile.in trunk/ndb/src/common/transporter/Makefile.in
---- trunk~/ndb/src/common/transporter/Makefile.in	2007-11-15 08:08:27.000000000 -0600
-+++ trunk/ndb/src/common/transporter/Makefile.in	2007-12-27 15:54:48.962245081 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/transporter/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/transporter/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/transporter/Makefile.in	2008-01-11 12:45:51.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/transporter/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3711,9 +3711,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/common/util/Makefile.in trunk/ndb/src/common/util/Makefile.in
---- trunk~/ndb/src/common/util/Makefile.in	2007-11-15 08:08:28.000000000 -0600
-+++ trunk/ndb/src/common/util/Makefile.in	2007-12-27 15:54:48.962245081 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/common/util/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/common/util/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/common/util/Makefile.in	2008-01-11 12:45:53.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/common/util/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3722,9 +3722,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/cw/Makefile.in trunk/ndb/src/cw/Makefile.in
---- trunk~/ndb/src/cw/Makefile.in	2007-11-15 08:08:28.000000000 -0600
-+++ trunk/ndb/src/cw/Makefile.in	2007-12-27 15:54:48.966245309 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/cw/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/cw/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/cw/Makefile.in	2008-01-11 12:45:53.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/cw/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3733,9 +3733,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/cw/cpcd/Makefile.in trunk/ndb/src/cw/cpcd/Makefile.in
---- trunk~/ndb/src/cw/cpcd/Makefile.in	2007-11-15 08:08:29.000000000 -0600
-+++ trunk/ndb/src/cw/cpcd/Makefile.in	2007-12-27 15:54:48.966245309 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/cw/cpcd/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/cw/cpcd/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/cw/cpcd/Makefile.in	2008-01-11 12:45:54.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/cw/cpcd/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3744,9 +3744,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/Makefile.in trunk/ndb/src/kernel/Makefile.in
---- trunk~/ndb/src/kernel/Makefile.in	2007-11-15 08:08:29.000000000 -0600
-+++ trunk/ndb/src/kernel/Makefile.in	2007-12-27 15:54:48.966245309 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/Makefile.in	2008-01-11 12:45:54.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/Makefile.in	2008-02-18 16:10:29.794658089 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3755,9 +3755,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/Makefile.in trunk/ndb/src/kernel/blocks/Makefile.in
---- trunk~/ndb/src/kernel/blocks/Makefile.in	2007-11-15 08:08:29.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/Makefile.in	2007-12-27 15:54:48.966245309 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/Makefile.in	2008-01-11 12:45:54.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3766,9 +3766,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/backup/Makefile.in trunk/ndb/src/kernel/blocks/backup/Makefile.in
---- trunk~/ndb/src/kernel/blocks/backup/Makefile.in	2007-11-15 08:08:30.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/backup/Makefile.in	2007-12-27 15:54:48.970245537 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/backup/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/backup/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/backup/Makefile.in	2008-01-11 12:45:55.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/backup/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3777,9 +3777,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/cmvmi/Makefile.in trunk/ndb/src/kernel/blocks/cmvmi/Makefile.in
---- trunk~/ndb/src/kernel/blocks/cmvmi/Makefile.in	2007-11-15 08:08:30.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/cmvmi/Makefile.in	2007-12-27 15:54:48.970245537 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/cmvmi/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/cmvmi/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/cmvmi/Makefile.in	2008-01-11 12:45:55.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/cmvmi/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3788,9 +3788,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbacc/Makefile.in trunk/ndb/src/kernel/blocks/dbacc/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbacc/Makefile.in	2007-11-15 08:08:30.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbacc/Makefile.in	2007-12-27 15:54:48.970245537 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbacc/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbacc/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbacc/Makefile.in	2008-01-11 12:45:56.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbacc/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3799,9 +3799,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbdict/Makefile.in trunk/ndb/src/kernel/blocks/dbdict/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbdict/Makefile.in	2007-11-15 08:08:31.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbdict/Makefile.in	2007-12-27 15:54:48.970245537 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbdict/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbdict/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbdict/Makefile.in	2008-01-11 12:45:56.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbdict/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3810,9 +3810,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbdih/Makefile.in trunk/ndb/src/kernel/blocks/dbdih/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbdih/Makefile.in	2007-11-15 08:08:31.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbdih/Makefile.in	2007-12-27 15:54:48.974245765 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbdih/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbdih/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbdih/Makefile.in	2008-01-11 12:45:57.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbdih/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3821,9 +3821,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dblqh/Makefile.in trunk/ndb/src/kernel/blocks/dblqh/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dblqh/Makefile.in	2007-11-15 08:08:32.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dblqh/Makefile.in	2007-12-27 15:54:48.974245765 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dblqh/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dblqh/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dblqh/Makefile.in	2008-01-11 12:45:57.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dblqh/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3832,9 +3832,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbtc/Makefile.in trunk/ndb/src/kernel/blocks/dbtc/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbtc/Makefile.in	2007-11-15 08:08:32.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbtc/Makefile.in	2007-12-27 15:54:48.974245765 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtc/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtc/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtc/Makefile.in	2008-01-11 12:45:58.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtc/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3843,9 +3843,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbtup/Makefile.in trunk/ndb/src/kernel/blocks/dbtup/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbtup/Makefile.in	2007-11-15 08:08:33.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbtup/Makefile.in	2007-12-27 15:54:48.974245765 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtup/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtup/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtup/Makefile.in	2008-01-11 12:45:59.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtup/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3854,9 +3854,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbtux/Makefile.in trunk/ndb/src/kernel/blocks/dbtux/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbtux/Makefile.in	2007-11-15 08:08:33.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbtux/Makefile.in	2007-12-27 15:54:49.006247589 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtux/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtux/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbtux/Makefile.in	2008-01-11 12:45:59.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbtux/Makefile.in	2008-02-18 16:10:29.806658192 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3865,9 +3865,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/dbutil/Makefile.in trunk/ndb/src/kernel/blocks/dbutil/Makefile.in
---- trunk~/ndb/src/kernel/blocks/dbutil/Makefile.in	2007-11-15 08:08:34.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/dbutil/Makefile.in	2007-12-27 15:54:49.006247589 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbutil/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbutil/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/dbutil/Makefile.in	2008-01-11 12:46:00.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/dbutil/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3876,9 +3876,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/ndbcntr/Makefile.in trunk/ndb/src/kernel/blocks/ndbcntr/Makefile.in
---- trunk~/ndb/src/kernel/blocks/ndbcntr/Makefile.in	2007-11-15 08:08:34.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/ndbcntr/Makefile.in	2007-12-27 15:54:49.006247589 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/ndbcntr/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/ndbcntr/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/ndbcntr/Makefile.in	2008-01-11 12:46:00.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/ndbcntr/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3887,9 +3887,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/ndbfs/Makefile.in trunk/ndb/src/kernel/blocks/ndbfs/Makefile.in
---- trunk~/ndb/src/kernel/blocks/ndbfs/Makefile.in	2007-11-15 08:08:34.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/ndbfs/Makefile.in	2007-12-27 15:54:49.010247817 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/ndbfs/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/ndbfs/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/ndbfs/Makefile.in	2008-01-11 12:46:01.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/ndbfs/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3898,9 +3898,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/qmgr/Makefile.in trunk/ndb/src/kernel/blocks/qmgr/Makefile.in
---- trunk~/ndb/src/kernel/blocks/qmgr/Makefile.in	2007-11-15 08:08:35.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/qmgr/Makefile.in	2007-12-27 15:54:49.018248273 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/qmgr/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/qmgr/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/qmgr/Makefile.in	2008-01-11 12:46:01.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/qmgr/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3909,9 +3909,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/suma/Makefile.in trunk/ndb/src/kernel/blocks/suma/Makefile.in
---- trunk~/ndb/src/kernel/blocks/suma/Makefile.in	2007-11-15 08:08:35.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/suma/Makefile.in	2007-12-27 15:54:49.018248273 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/suma/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/suma/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/suma/Makefile.in	2008-01-11 12:46:02.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/suma/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3920,9 +3920,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/blocks/trix/Makefile.in trunk/ndb/src/kernel/blocks/trix/Makefile.in
---- trunk~/ndb/src/kernel/blocks/trix/Makefile.in	2007-11-15 08:08:36.000000000 -0600
-+++ trunk/ndb/src/kernel/blocks/trix/Makefile.in	2007-12-27 15:54:49.018248273 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/trix/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/trix/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/blocks/trix/Makefile.in	2008-01-11 12:46:03.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/blocks/trix/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3931,9 +3931,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/error/Makefile.in trunk/ndb/src/kernel/error/Makefile.in
---- trunk~/ndb/src/kernel/error/Makefile.in	2007-11-15 08:08:36.000000000 -0600
-+++ trunk/ndb/src/kernel/error/Makefile.in	2007-12-27 15:54:49.030248957 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/error/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/error/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/error/Makefile.in	2008-01-11 12:46:03.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/error/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3942,9 +3942,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/kernel/vm/Makefile.in trunk/ndb/src/kernel/vm/Makefile.in
---- trunk~/ndb/src/kernel/vm/Makefile.in	2007-11-15 08:08:36.000000000 -0600
-+++ trunk/ndb/src/kernel/vm/Makefile.in	2007-12-27 15:54:49.030248957 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/vm/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/vm/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/kernel/vm/Makefile.in	2008-01-11 12:46:04.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/kernel/vm/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -100,6 +100,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3953,9 +3953,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/mgmapi/Makefile.in trunk/ndb/src/mgmapi/Makefile.in
---- trunk~/ndb/src/mgmapi/Makefile.in	2007-11-15 08:08:37.000000000 -0600
-+++ trunk/ndb/src/mgmapi/Makefile.in	2007-12-27 15:54:49.030248957 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmapi/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/mgmapi/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmapi/Makefile.in	2008-01-11 12:46:04.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/mgmapi/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3964,9 +3964,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/mgmclient/Makefile.in trunk/ndb/src/mgmclient/Makefile.in
---- trunk~/ndb/src/mgmclient/Makefile.in	2007-11-15 08:08:37.000000000 -0600
-+++ trunk/ndb/src/mgmclient/Makefile.in	2007-12-27 15:54:49.042249641 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmclient/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/mgmclient/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmclient/Makefile.in	2008-01-11 12:46:05.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/mgmclient/Makefile.in	2008-02-18 16:10:29.810658226 -0300
 @@ -97,6 +97,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3975,9 +3975,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/mgmsrv/Makefile.in trunk/ndb/src/mgmsrv/Makefile.in
---- trunk~/ndb/src/mgmsrv/Makefile.in	2007-11-15 08:08:38.000000000 -0600
-+++ trunk/ndb/src/mgmsrv/Makefile.in	2007-12-27 15:54:49.110253516 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmsrv/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/mgmsrv/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/mgmsrv/Makefile.in	2008-01-11 12:46:06.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/mgmsrv/Makefile.in	2008-02-18 16:10:29.894658941 -0300
 @@ -96,6 +96,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3986,9 +3986,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/src/ndbapi/Makefile.in trunk/ndb/src/ndbapi/Makefile.in
---- trunk~/ndb/src/ndbapi/Makefile.in	2007-11-15 08:08:38.000000000 -0600
-+++ trunk/ndb/src/ndbapi/Makefile.in	2007-12-27 15:54:49.170256935 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/src/ndbapi/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/src/ndbapi/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/src/ndbapi/Makefile.in	2008-01-11 12:46:06.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/src/ndbapi/Makefile.in	2008-02-18 16:10:29.894658941 -0300
 @@ -97,6 +97,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -3997,9 +3997,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/Makefile.in trunk/ndb/test/Makefile.in
---- trunk~/ndb/test/Makefile.in	2007-11-15 08:08:38.000000000 -0600
-+++ trunk/ndb/test/Makefile.in	2007-12-27 15:54:49.170256935 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/Makefile.in	2008-01-11 12:46:07.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/Makefile.in	2008-02-18 16:10:29.894658941 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4008,9 +4008,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/ndbapi/Makefile.in trunk/ndb/test/ndbapi/Makefile.in
---- trunk~/ndb/test/ndbapi/Makefile.in	2007-11-15 08:08:40.000000000 -0600
-+++ trunk/ndb/test/ndbapi/Makefile.in	2007-12-27 15:54:49.174257163 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/ndbapi/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/ndbapi/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/ndbapi/Makefile.in	2008-01-11 12:46:09.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/ndbapi/Makefile.in	2008-02-18 16:10:29.894658941 -0300
 @@ -114,6 +114,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4019,9 +4019,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/ndbapi/bank/Makefile.in trunk/ndb/test/ndbapi/bank/Makefile.in
---- trunk~/ndb/test/ndbapi/bank/Makefile.in	2007-11-15 08:08:40.000000000 -0600
-+++ trunk/ndb/test/ndbapi/bank/Makefile.in	2007-12-27 15:54:49.174257163 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/ndbapi/bank/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/ndbapi/bank/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/ndbapi/bank/Makefile.in	2008-01-11 12:46:09.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/ndbapi/bank/Makefile.in	2008-02-18 16:10:29.898658975 -0300
 @@ -100,6 +100,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4030,9 +4030,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/run-test/Makefile.in trunk/ndb/test/run-test/Makefile.in
---- trunk~/ndb/test/run-test/Makefile.in	2007-11-15 08:08:41.000000000 -0600
-+++ trunk/ndb/test/run-test/Makefile.in	2007-12-27 15:54:49.174257163 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/run-test/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/run-test/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/run-test/Makefile.in	2008-01-11 12:46:10.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/run-test/Makefile.in	2008-02-18 16:10:30.106660745 -0300
 @@ -114,6 +114,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4041,9 +4041,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/src/Makefile.in trunk/ndb/test/src/Makefile.in
---- trunk~/ndb/test/src/Makefile.in	2007-11-15 08:08:41.000000000 -0600
-+++ trunk/ndb/test/src/Makefile.in	2007-12-27 15:54:49.178257391 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/src/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/src/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/src/Makefile.in	2008-01-11 12:46:11.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/src/Makefile.in	2008-02-18 16:10:30.106660745 -0300
 @@ -95,6 +95,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4052,9 +4052,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/test/tools/Makefile.in trunk/ndb/test/tools/Makefile.in
---- trunk~/ndb/test/tools/Makefile.in	2007-11-15 08:08:42.000000000 -0600
-+++ trunk/ndb/test/tools/Makefile.in	2007-12-27 15:54:49.178257391 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/test/tools/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/test/tools/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/test/tools/Makefile.in	2008-01-11 12:46:12.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/test/tools/Makefile.in	2008-02-18 16:10:30.106660745 -0300
 @@ -101,6 +101,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4063,9 +4063,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/ndb/tools/Makefile.in trunk/ndb/tools/Makefile.in
---- trunk~/ndb/tools/Makefile.in	2007-11-15 08:08:42.000000000 -0600
-+++ trunk/ndb/tools/Makefile.in	2007-12-27 15:54:49.178257391 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/ndb/tools/Makefile.in mysql-dfsg-5.0-5.0.51a/ndb/tools/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/ndb/tools/Makefile.in	2008-01-11 12:46:13.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/ndb/tools/Makefile.in	2008-02-18 16:10:30.106660745 -0300
 @@ -104,6 +104,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4074,9 +4074,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/netware/Makefile.in trunk/netware/Makefile.in
---- trunk~/netware/Makefile.in	2007-11-15 08:08:43.000000000 -0600
-+++ trunk/netware/Makefile.in	2007-12-27 15:54:49.250261494 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/netware/Makefile.in mysql-dfsg-5.0-5.0.51a/netware/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/netware/Makefile.in	2008-01-11 12:46:14.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/netware/Makefile.in	2008-02-18 16:10:30.106660745 -0300
 @@ -67,6 +67,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4085,9 +4085,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/os2/Makefile.in trunk/os2/Makefile.in
---- trunk~/os2/Makefile.in	2007-11-15 08:08:43.000000000 -0600
-+++ trunk/os2/Makefile.in	2007-12-27 15:54:49.254261722 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/os2/Makefile.in mysql-dfsg-5.0-5.0.51a/os2/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/os2/Makefile.in	2008-01-11 12:46:15.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/os2/Makefile.in	2008-02-18 16:10:30.118660847 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4096,9 +4096,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/os2/include/Makefile.in trunk/os2/include/Makefile.in
---- trunk~/os2/include/Makefile.in	2007-11-15 08:08:44.000000000 -0600
-+++ trunk/os2/include/Makefile.in	2007-12-27 15:54:49.254261722 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/os2/include/Makefile.in mysql-dfsg-5.0-5.0.51a/os2/include/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/os2/include/Makefile.in	2008-01-11 12:46:15.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/os2/include/Makefile.in	2008-02-18 16:10:30.278662209 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4107,9 +4107,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/os2/include/sys/Makefile.in trunk/os2/include/sys/Makefile.in
---- trunk~/os2/include/sys/Makefile.in	2007-11-15 08:08:44.000000000 -0600
-+++ trunk/os2/include/sys/Makefile.in	2007-12-27 15:54:49.254261722 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/os2/include/sys/Makefile.in mysql-dfsg-5.0-5.0.51a/os2/include/sys/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/os2/include/sys/Makefile.in	2008-01-11 12:46:16.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/os2/include/sys/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4118,9 +4118,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/pstack/Makefile.in trunk/pstack/Makefile.in
---- trunk~/pstack/Makefile.in	2007-11-15 08:08:44.000000000 -0600
-+++ trunk/pstack/Makefile.in	2007-12-27 15:54:49.254261722 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/pstack/Makefile.in mysql-dfsg-5.0-5.0.51a/pstack/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/pstack/Makefile.in	2008-01-11 12:46:17.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/pstack/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -70,6 +70,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4129,9 +4129,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/pstack/aout/Makefile.in trunk/pstack/aout/Makefile.in
---- trunk~/pstack/aout/Makefile.in	2007-11-15 08:08:45.000000000 -0600
-+++ trunk/pstack/aout/Makefile.in	2007-12-27 15:54:49.254261722 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/pstack/aout/Makefile.in mysql-dfsg-5.0-5.0.51a/pstack/aout/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/pstack/aout/Makefile.in	2008-01-11 12:46:17.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/pstack/aout/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -49,6 +49,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4140,9 +4140,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/regex/Makefile.in trunk/regex/Makefile.in
---- trunk~/regex/Makefile.in	2007-11-15 08:08:45.000000000 -0600
-+++ trunk/regex/Makefile.in	2007-12-27 15:54:49.258261950 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/regex/Makefile.in mysql-dfsg-5.0-5.0.51a/regex/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/regex/Makefile.in	2008-01-11 12:46:18.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/regex/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -69,6 +69,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4151,9 +4151,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/scripts/Makefile.in trunk/scripts/Makefile.in
---- trunk~/scripts/Makefile.in	2007-11-15 08:08:46.000000000 -0600
-+++ trunk/scripts/Makefile.in	2007-12-27 15:54:49.258261950 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/scripts/Makefile.in mysql-dfsg-5.0-5.0.51a/scripts/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/scripts/Makefile.in	2008-01-11 12:46:19.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/scripts/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4162,9 +4162,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/server-tools/Makefile.in trunk/server-tools/Makefile.in
---- trunk~/server-tools/Makefile.in	2007-11-15 08:08:46.000000000 -0600
-+++ trunk/server-tools/Makefile.in	2007-12-27 15:54:49.258261950 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/server-tools/Makefile.in mysql-dfsg-5.0-5.0.51a/server-tools/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/server-tools/Makefile.in	2008-01-11 12:46:19.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/server-tools/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4173,9 +4173,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/server-tools/instance-manager/Makefile.in trunk/server-tools/instance-manager/Makefile.in
---- trunk~/server-tools/instance-manager/Makefile.in	2007-11-15 08:08:46.000000000 -0600
-+++ trunk/server-tools/instance-manager/Makefile.in	2007-12-27 15:54:49.258261950 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/server-tools/instance-manager/Makefile.in mysql-dfsg-5.0-5.0.51a/server-tools/instance-manager/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/server-tools/instance-manager/Makefile.in	2008-01-11 12:46:20.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/server-tools/instance-manager/Makefile.in	2008-02-18 16:10:30.282662243 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4184,9 +4184,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/sql/Makefile.am trunk/sql/Makefile.am
---- trunk~/sql/Makefile.am	2007-11-15 08:06:51.000000000 -0600
-+++ trunk/sql/Makefile.am	2007-12-27 15:54:49.262262178 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/Makefile.am mysql-dfsg-5.0-5.0.51a/sql/Makefile.am
+--- mysql-dfsg-5.0-5.0.51a~/sql/Makefile.am	2008-01-11 12:43:37.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/Makefile.am	2008-02-18 16:10:30.282662243 -0300
 @@ -68,6 +68,7 @@
  			sql_array.h sql_cursor.h \
  			examples/ha_example.h ha_archive.h \
@@ -4203,9 +4203,9 @@
  			ha_federated.cc
  
  gen_lex_hash_SOURCES =	gen_lex_hash.cc
-diff -urNad trunk~/sql/Makefile.am.orig trunk/sql/Makefile.am.orig
---- trunk~/sql/Makefile.am.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/Makefile.am.orig	2007-12-27 15:54:49.262262178 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/Makefile.am.orig mysql-dfsg-5.0-5.0.51a/sql/Makefile.am.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/Makefile.am.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/Makefile.am.orig	2008-02-18 16:10:30.290662311 -0300
 @@ -0,0 +1,179 @@
 +# Copyright (C) 2000-2006 MySQL AB
 +# 
@@ -4386,9 +4386,9 @@
 +
 +# Don't update the files from bitkeeper
 +%::SCCS/s.%
-diff -urNad trunk~/sql/Makefile.in trunk/sql/Makefile.in
---- trunk~/sql/Makefile.in	2007-11-15 08:08:48.000000000 -0600
-+++ trunk/sql/Makefile.in	2007-12-27 15:54:49.262262178 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/Makefile.in mysql-dfsg-5.0-5.0.51a/sql/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/sql/Makefile.in	2008-01-11 12:46:22.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/Makefile.in	2008-02-18 16:10:30.290662311 -0300
 @@ -71,6 +71,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -4452,9 +4452,9 @@
  .yy.cc:
  	$(YACCCOMPILE) $<
  	if test -f y.tab.h; then \
-diff -urNad trunk~/sql/handler.cc trunk/sql/handler.cc
---- trunk~/sql/handler.cc	2007-11-15 08:06:32.000000000 -0600
-+++ trunk/sql/handler.cc	2007-12-27 15:54:49.266262406 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/handler.cc mysql-dfsg-5.0-5.0.51a/sql/handler.cc
+--- mysql-dfsg-5.0-5.0.51a~/sql/handler.cc	2008-01-11 12:43:23.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/handler.cc	2008-02-18 16:10:30.290662311 -0300
 @@ -77,6 +77,15 @@
    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
    HTON_NO_FLAGS };
@@ -4492,9 +4492,9 @@
  #ifdef HAVE_NDBCLUSTER_DB
    case DB_TYPE_NDBCLUSTER:
      if (have_ndbcluster == SHOW_OPTION_YES)
-diff -urNad trunk~/sql/handler.cc.orig trunk/sql/handler.cc.orig
---- trunk~/sql/handler.cc.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/handler.cc.orig	2007-12-27 15:54:49.270262634 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/handler.cc.orig mysql-dfsg-5.0-5.0.51a/sql/handler.cc.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/handler.cc.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/handler.cc.orig	2008-02-18 16:10:30.298662379 -0300
 @@ -0,0 +1,2797 @@
 +/* Copyright (C) 2000-2006 MySQL AB
 +
@@ -7293,9 +7293,9 @@
 +  }
 +  return &known_extensions;
 +}
-diff -urNad trunk~/sql/handler.h trunk/sql/handler.h
---- trunk~/sql/handler.h	2007-11-15 08:06:48.000000000 -0600
-+++ trunk/sql/handler.h	2007-12-27 15:54:49.270262634 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/handler.h mysql-dfsg-5.0-5.0.51a/sql/handler.h
+--- mysql-dfsg-5.0-5.0.51a~/sql/handler.h	2008-01-11 12:43:28.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/handler.h	2008-02-18 16:10:30.298662379 -0300
 @@ -186,8 +186,9 @@
    DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB,
    DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
@@ -7307,9 +7307,9 @@
    DB_TYPE_DEFAULT // Must be last
  };
  
-diff -urNad trunk~/sql/handler.h.orig trunk/sql/handler.h.orig
---- trunk~/sql/handler.h.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/handler.h.orig	2007-12-27 15:54:49.274262862 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/handler.h.orig mysql-dfsg-5.0-5.0.51a/sql/handler.h.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/handler.h.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/handler.h.orig	2008-02-18 16:10:30.326662617 -0300
 @@ -0,0 +1,1079 @@
 +/* Copyright (C) 2000-2006 MySQL AB
 +
@@ -8390,9 +8390,9 @@
 +*/
 +#define trans_need_2pc(thd, all)                   ((total_ha_2pc > 1) && \
 +        !((all ? &thd->transaction.all : &thd->transaction.stmt)->no_2pc))
-diff -urNad trunk~/sql/mysql_priv.h trunk/sql/mysql_priv.h
---- trunk~/sql/mysql_priv.h	2007-11-15 08:06:52.000000000 -0600
-+++ trunk/sql/mysql_priv.h	2007-12-27 15:54:49.274262862 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/mysql_priv.h mysql-dfsg-5.0-5.0.51a/sql/mysql_priv.h
+--- mysql-dfsg-5.0-5.0.51a~/sql/mysql_priv.h	2008-01-11 12:43:38.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/mysql_priv.h	2008-02-18 16:10:30.326662617 -0300
 @@ -1408,6 +1408,12 @@
  #else
  extern SHOW_COMP_OPTION have_csv_db;
@@ -8406,9 +8406,9 @@
  #ifdef HAVE_FEDERATED_DB
  extern handlerton federated_hton;
  #define have_federated_db federated_hton.state
-diff -urNad trunk~/sql/mysql_priv.h.orig trunk/sql/mysql_priv.h.orig
---- trunk~/sql/mysql_priv.h.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/mysql_priv.h.orig	2007-12-27 15:54:49.278263090 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/mysql_priv.h.orig mysql-dfsg-5.0-5.0.51a/sql/mysql_priv.h.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/mysql_priv.h.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/mysql_priv.h.orig	2008-02-18 16:10:30.382663094 -0300
 @@ -0,0 +1,1761 @@
 +/* Copyright (C) 2000-2003 MySQL AB
 +
@@ -10171,9 +10171,9 @@
 +#endif /* MYSQL_CLIENT */
 +
 +#endif
-diff -urNad trunk~/sql/mysqld.cc trunk/sql/mysqld.cc
---- trunk~/sql/mysqld.cc	2007-11-15 08:06:16.000000000 -0600
-+++ trunk/sql/mysqld.cc	2007-12-27 15:54:49.290263774 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/mysqld.cc mysql-dfsg-5.0-5.0.51a/sql/mysqld.cc
+--- mysql-dfsg-5.0-5.0.51a~/sql/mysqld.cc	2008-01-11 12:43:18.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/mysqld.cc	2008-02-18 16:10:30.390663162 -0300
 @@ -6688,6 +6688,11 @@
  #else
    have_csv_db= SHOW_OPTION_NO;
@@ -10202,9 +10202,9 @@
  SHOW_COMP_OPTION have_federated_db= SHOW_OPTION_NO;
  SHOW_COMP_OPTION have_partition_db= SHOW_OPTION_NO;
  SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
-diff -urNad trunk~/sql/mysqld.cc.orig trunk/sql/mysqld.cc.orig
---- trunk~/sql/mysqld.cc.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/mysqld.cc.orig	2007-12-27 15:54:49.306264686 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/mysqld.cc.orig mysql-dfsg-5.0-5.0.51a/sql/mysqld.cc.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/mysqld.cc.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/mysqld.cc.orig	2008-02-18 16:10:30.438663570 -0300
 @@ -0,0 +1,7811 @@
 +/* Copyright (C) 2000-2003 MySQL AB
 +
@@ -18017,9 +18017,9 @@
 +template class I_List<Statement>;
 +template class I_List_iterator<Statement>;
 +#endif
-diff -urNad trunk~/sql/set_var.cc trunk/sql/set_var.cc
---- trunk~/sql/set_var.cc	2007-11-15 08:06:50.000000000 -0600
-+++ trunk/sql/set_var.cc	2007-12-27 15:54:49.310264914 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/set_var.cc mysql-dfsg-5.0-5.0.51a/sql/set_var.cc
+--- mysql-dfsg-5.0-5.0.51a~/sql/set_var.cc	2008-01-11 12:43:29.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/set_var.cc	2008-02-18 16:10:30.446663638 -0300
 @@ -882,6 +882,7 @@
    {"have_compress",	      (char*) &have_compress,		    SHOW_HAVE},
    {"have_crypt",	      (char*) &have_crypt,		    SHOW_HAVE},
@@ -18028,9 +18028,9 @@
    {"have_dynamic_loading",    (char*) &have_dlopen,	            SHOW_HAVE},
    {"have_example_engine",     (char*) &have_example_db,	            SHOW_HAVE},
    {"have_federated_engine",   (char*) &have_federated_db,           SHOW_HAVE},
-diff -urNad trunk~/sql/set_var.cc.orig trunk/sql/set_var.cc.orig
---- trunk~/sql/set_var.cc.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/set_var.cc.orig	2007-12-27 15:54:49.318265370 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/set_var.cc.orig mysql-dfsg-5.0-5.0.51a/sql/set_var.cc.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/set_var.cc.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/set_var.cc.orig	2008-02-18 16:10:30.450663673 -0300
 @@ -0,0 +1,3751 @@
 +/* Copyright (C) 2000-2003 MySQL AB
 +
@@ -21783,9 +21783,9 @@
 +template class List_iterator_fast<set_var_base>;
 +template class I_List_iterator<NAMED_LIST>;
 +#endif
-diff -urNad trunk~/sql/share/Makefile.in trunk/sql/share/Makefile.in
---- trunk~/sql/share/Makefile.in	2007-11-15 08:08:48.000000000 -0600
-+++ trunk/sql/share/Makefile.in	2007-12-27 15:54:49.322265598 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/share/Makefile.in mysql-dfsg-5.0-5.0.51a/sql/share/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/sql/share/Makefile.in	2008-01-11 12:46:22.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/share/Makefile.in	2008-02-18 16:10:30.450663673 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -21794,9 +21794,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/sql/sphinx/cmakelists.txt trunk/sql/sphinx/cmakelists.txt
---- trunk~/sql/sphinx/cmakelists.txt	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sphinx/cmakelists.txt	2007-12-27 15:54:49.322265598 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sphinx/cmakelists.txt mysql-dfsg-5.0-5.0.51a/sql/sphinx/cmakelists.txt
+--- mysql-dfsg-5.0-5.0.51a~/sql/sphinx/cmakelists.txt	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sphinx/cmakelists.txt	2008-02-18 16:10:30.458663741 -0300
 @@ -0,0 +1,6 @@
 +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
@@ -21804,9 +21804,9 @@
 +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
 +                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 +ADD_LIBRARY(example ha_example.cc)
-diff -urNad trunk~/sql/sphinx/gen_data.php trunk/sql/sphinx/gen_data.php
---- trunk~/sql/sphinx/gen_data.php	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sphinx/gen_data.php	2007-12-27 15:54:49.322265598 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sphinx/gen_data.php mysql-dfsg-5.0-5.0.51a/sql/sphinx/gen_data.php
+--- mysql-dfsg-5.0-5.0.51a~/sql/sphinx/gen_data.php	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sphinx/gen_data.php	2008-02-18 16:10:30.458663741 -0300
 @@ -0,0 +1,37 @@
 +<?php
 +
@@ -21845,12 +21845,12 @@
 +  
 +
 +?>
-diff -urNad trunk~/sql/sphinx/ha_sphinx.cc trunk/sql/sphinx/ha_sphinx.cc
---- trunk~/sql/sphinx/ha_sphinx.cc	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sphinx/ha_sphinx.cc	2007-12-27 15:54:49.326265826 -0600
-@@ -0,0 +1,2357 @@
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sphinx/ha_sphinx.cc mysql-dfsg-5.0-5.0.51a/sql/sphinx/ha_sphinx.cc
+--- mysql-dfsg-5.0-5.0.51a~/sql/sphinx/ha_sphinx.cc	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sphinx/ha_sphinx.cc	2008-02-18 16:11:19.747083225 -0300
+@@ -0,0 +1,2366 @@
 +//
-+// $Id: ha_sphinx.cc 870 2007-10-13 15:45:44Z shodan $
++// $Id: ha_sphinx.cc 1009 2007-12-19 16:55:51Z shodan $
 +//
 +
 +#ifdef USE_PRAGMA_IMPLEMENTATION
@@ -21939,6 +21939,8 @@
 +	SPH_MATCH_PHRASE,			///< match this exact phrase
 +	SPH_MATCH_BOOLEAN,			///< match this boolean query
 +	SPH_MATCH_EXTENDED,			///< match this extended query
++	SPH_MATCH_FULLSCAN,			///< match all document IDs w/o fulltext query, apply filters
++	SPH_MATCH_EXTENDED2,		///< extended engine V2 (TEMPORARY, WILL BE REMOVED IN 0.9.8-RELEASE)
 +
 +	SPH_MATCH_TOTAL
 +};
@@ -22709,8 +22711,12 @@
 +#if MYSQL_VERSION_ID>=50120
 +		pShare = (CSphSEShare*) hash_search ( &sphinx_open_tables, (const uchar *) table_name, strlen(table_name) );
 +#else
++#ifdef __WIN__
++		pShare = (CSphSEShare*) hash_search ( &sphinx_open_tables, (const byte *) table_name, strlen(table_name) );
++#else
 +		pShare = (CSphSEShare*) hash_search ( &sphinx_open_tables, table_name, strlen(table_name) );
-+#endif
++#endif // win
++#endif // pre-5.1.20
 +
 +		if ( pShare )
 +		{
@@ -22944,7 +22950,10 @@
 +		if ( !strcmp ( sValue, "any") )				m_eMode = SPH_MATCH_ANY;
 +		else if ( !strcmp ( sValue, "phrase" ) )	m_eMode = SPH_MATCH_PHRASE;
 +		else if ( !strcmp ( sValue, "boolean") )	m_eMode = SPH_MATCH_BOOLEAN;
++		else if ( !strcmp ( sValue, "ext") )		m_eMode = SPH_MATCH_EXTENDED;
 +		else if ( !strcmp ( sValue, "extended") )	m_eMode = SPH_MATCH_EXTENDED;
++		else if ( !strcmp ( sValue, "ext2") )		m_eMode = SPH_MATCH_EXTENDED2;
++		else if ( !strcmp ( sValue, "extended2") )	m_eMode = SPH_MATCH_EXTENDED2;
 +		else if ( !strcmp ( sValue, "all") )		m_eMode = SPH_MATCH_ALL;
 +		else
 +		{
@@ -24204,11 +24213,11 @@
 +#endif // >50100
 +
 +//
-+// $Id: ha_sphinx.cc 870 2007-10-13 15:45:44Z shodan $
++// $Id: ha_sphinx.cc 1009 2007-12-19 16:55:51Z shodan $
 +//
-diff -urNad trunk~/sql/sphinx/ha_sphinx.h trunk/sql/sphinx/ha_sphinx.h
---- trunk~/sql/sphinx/ha_sphinx.h	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sphinx/ha_sphinx.h	2007-12-27 15:54:49.326265826 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sphinx/ha_sphinx.h mysql-dfsg-5.0-5.0.51a/sql/sphinx/ha_sphinx.h
+--- mysql-dfsg-5.0-5.0.51a~/sql/sphinx/ha_sphinx.h	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sphinx/ha_sphinx.h	2008-02-18 16:10:30.458663741 -0300
 @@ -0,0 +1,154 @@
 +//
 +// $Id: ha_sphinx.h 869 2007-10-13 15:24:22Z shodan $
@@ -24364,18 +24373,18 @@
 +//
 +// $Id: ha_sphinx.h 869 2007-10-13 15:24:22Z shodan $
 +//
-diff -urNad trunk~/sql/sphinx/plug.in trunk/sql/sphinx/plug.in
---- trunk~/sql/sphinx/plug.in	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sphinx/plug.in	2007-12-27 15:54:49.326265826 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sphinx/plug.in mysql-dfsg-5.0-5.0.51a/sql/sphinx/plug.in
+--- mysql-dfsg-5.0-5.0.51a~/sql/sphinx/plug.in	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sphinx/plug.in	2008-02-18 16:10:30.458663741 -0300
 @@ -0,0 +1,5 @@
 +MYSQL_STORAGE_ENGINE(sphinx,,  [Sphinx Storage Engine],
 +        [Sphinx Storage Engines], [max,max-no-ndb])
 +MYSQL_PLUGIN_DIRECTORY(sphinx, [storage/sphinx])
 +MYSQL_PLUGIN_STATIC(sphinx,    [libsphinx.a])
 +MYSQL_PLUGIN_DYNAMIC(sphinx,   [ha_sphinx.la])
-diff -urNad trunk~/sql/sql_lex.h trunk/sql/sql_lex.h
---- trunk~/sql/sql_lex.h	2007-11-15 08:06:15.000000000 -0600
-+++ trunk/sql/sql_lex.h	2007-12-27 15:54:49.330266054 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sql_lex.h mysql-dfsg-5.0-5.0.51a/sql/sql_lex.h
+--- mysql-dfsg-5.0-5.0.51a~/sql/sql_lex.h	2008-01-11 12:43:14.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/sql_lex.h	2008-02-18 16:10:30.458663741 -0300
 @@ -57,6 +57,7 @@
    SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
    SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_LOGS, SQLCOM_SHOW_STATUS,
@@ -24384,9 +24393,9 @@
    SQLCOM_SHOW_PROCESSLIST, SQLCOM_SHOW_MASTER_STAT, SQLCOM_SHOW_SLAVE_STAT,
    SQLCOM_SHOW_GRANTS, SQLCOM_SHOW_CREATE, SQLCOM_SHOW_CHARSETS,
    SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
-diff -urNad trunk~/sql/sql_parse.cc trunk/sql/sql_parse.cc
---- trunk~/sql/sql_parse.cc	2007-11-15 08:06:52.000000000 -0600
-+++ trunk/sql/sql_parse.cc	2007-12-27 15:54:49.546278363 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sql_parse.cc mysql-dfsg-5.0-5.0.51a/sql/sql_parse.cc
+--- mysql-dfsg-5.0-5.0.51a~/sql/sql_parse.cc	2008-01-11 12:43:38.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/sql_parse.cc	2008-02-18 16:10:30.462663775 -0300
 @@ -24,6 +24,9 @@
  #ifdef HAVE_INNOBASE_DB
  #include "ha_innodb.h"
@@ -24413,9 +24422,9 @@
  #ifdef HAVE_REPLICATION
    case SQLCOM_LOAD_MASTER_TABLE:
    {
-diff -urNad trunk~/sql/sql_parse.cc.orig trunk/sql/sql_parse.cc.orig
---- trunk~/sql/sql_parse.cc.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sql_parse.cc.orig	2007-12-27 15:54:49.570279731 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sql_parse.cc.orig mysql-dfsg-5.0-5.0.51a/sql/sql_parse.cc.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/sql_parse.cc.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sql_parse.cc.orig	2008-02-18 16:10:30.462663775 -0300
 @@ -0,0 +1,7845 @@
 +/* Copyright (C) 2000-2003 MySQL AB
 +
@@ -32262,9 +32271,9 @@
 +
 +  return TRUE;
 +}
-diff -urNad trunk~/sql/sql_yacc.yy trunk/sql/sql_yacc.yy
---- trunk~/sql/sql_yacc.yy	2007-11-15 08:06:49.000000000 -0600
-+++ trunk/sql/sql_yacc.yy	2007-12-27 15:54:49.574279959 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sql_yacc.yy mysql-dfsg-5.0-5.0.51a/sql/sql_yacc.yy
+--- mysql-dfsg-5.0-5.0.51a~/sql/sql_yacc.yy	2008-01-11 12:43:29.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql/sql_yacc.yy	2008-02-18 16:10:30.470663843 -0300
 @@ -7273,6 +7273,9 @@
  	    case DB_TYPE_INNODB:
  	      Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
@@ -32275,9 +32284,9 @@
  	    default:
  	      my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
  	      MYSQL_YYABORT;
-diff -urNad trunk~/sql/sql_yacc.yy.orig trunk/sql/sql_yacc.yy.orig
---- trunk~/sql/sql_yacc.yy.orig	1969-12-31 18:00:00.000000000 -0600
-+++ trunk/sql/sql_yacc.yy.orig	2007-12-27 15:54:49.582280415 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql/sql_yacc.yy.orig mysql-dfsg-5.0-5.0.51a/sql/sql_yacc.yy.orig
+--- mysql-dfsg-5.0-5.0.51a~/sql/sql_yacc.yy.orig	1969-12-31 21:00:00.000000000 -0300
++++ mysql-dfsg-5.0-5.0.51a/sql/sql_yacc.yy.orig	2008-02-18 16:10:30.474663877 -0300
 @@ -0,0 +1,10061 @@
 +/* Copyright (C) 2000-2003 MySQL AB
 +
@@ -42340,9 +42349,9 @@
 +    ;
 +
 +
-diff -urNad trunk~/sql-bench/Makefile.in trunk/sql-bench/Makefile.in
---- trunk~/sql-bench/Makefile.in	2007-11-15 08:08:47.000000000 -0600
-+++ trunk/sql-bench/Makefile.in	2007-12-27 15:54:49.582280415 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql-bench/Makefile.in mysql-dfsg-5.0-5.0.51a/sql-bench/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/sql-bench/Makefile.in	2008-01-11 12:46:21.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql-bench/Makefile.in	2008-02-18 16:10:30.474663877 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42351,9 +42360,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/sql-common/Makefile.in trunk/sql-common/Makefile.in
---- trunk~/sql-common/Makefile.in	2007-11-15 08:08:47.000000000 -0600
-+++ trunk/sql-common/Makefile.in	2007-12-27 15:54:49.582280415 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/sql-common/Makefile.in mysql-dfsg-5.0-5.0.51a/sql-common/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/sql-common/Makefile.in	2008-01-11 12:46:21.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/sql-common/Makefile.in	2008-02-18 16:10:30.474663877 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42362,9 +42371,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/strings/Makefile.in trunk/strings/Makefile.in
---- trunk~/strings/Makefile.in	2007-11-15 08:08:48.000000000 -0600
-+++ trunk/strings/Makefile.in	2007-12-27 15:54:49.582280415 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/strings/Makefile.in mysql-dfsg-5.0-5.0.51a/strings/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/strings/Makefile.in	2008-01-11 12:46:23.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/strings/Makefile.in	2008-02-18 16:10:30.474663877 -0300
 @@ -68,6 +68,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42373,9 +42382,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/support-files/MacOSX/Makefile.in trunk/support-files/MacOSX/Makefile.in
---- trunk~/support-files/MacOSX/Makefile.in	2007-11-15 08:08:49.000000000 -0600
-+++ trunk/support-files/MacOSX/Makefile.in	2007-12-27 15:54:49.658284746 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/support-files/MacOSX/Makefile.in mysql-dfsg-5.0-5.0.51a/support-files/MacOSX/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/support-files/MacOSX/Makefile.in	2008-01-11 12:46:24.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/support-files/MacOSX/Makefile.in	2008-02-18 16:10:30.474663877 -0300
 @@ -65,6 +65,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42384,9 +42393,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/support-files/Makefile.in trunk/support-files/Makefile.in
---- trunk~/support-files/Makefile.in	2007-11-15 08:08:49.000000000 -0600
-+++ trunk/support-files/Makefile.in	2007-12-27 15:54:49.670285430 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/support-files/Makefile.in mysql-dfsg-5.0-5.0.51a/support-files/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/support-files/Makefile.in	2008-01-11 12:46:24.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/support-files/Makefile.in	2008-02-18 16:10:30.494664047 -0300
 @@ -66,6 +66,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42395,9 +42404,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/support-files/RHEL4-SElinux/Makefile.in trunk/support-files/RHEL4-SElinux/Makefile.in
---- trunk~/support-files/RHEL4-SElinux/Makefile.in	2007-11-15 08:08:49.000000000 -0600
-+++ trunk/support-files/RHEL4-SElinux/Makefile.in	2007-12-27 15:54:49.670285430 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/support-files/RHEL4-SElinux/Makefile.in mysql-dfsg-5.0-5.0.51a/support-files/RHEL4-SElinux/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/support-files/RHEL4-SElinux/Makefile.in	2008-01-11 12:46:24.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/support-files/RHEL4-SElinux/Makefile.in	2008-02-18 16:10:30.506664149 -0300
 @@ -64,6 +64,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42406,9 +42415,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/tests/Makefile.in trunk/tests/Makefile.in
---- trunk~/tests/Makefile.in	2007-11-15 08:08:50.000000000 -0600
-+++ trunk/tests/Makefile.in	2007-12-27 15:54:49.670285430 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/tests/Makefile.in mysql-dfsg-5.0-5.0.51a/tests/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/tests/Makefile.in	2008-01-11 12:46:25.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/tests/Makefile.in	2008-02-18 16:10:30.506664149 -0300
 @@ -68,6 +68,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42417,9 +42426,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/tools/Makefile.in trunk/tools/Makefile.in
---- trunk~/tools/Makefile.in	2007-11-15 08:08:50.000000000 -0600
-+++ trunk/tools/Makefile.in	2007-12-27 15:54:50.166313697 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/tools/Makefile.in mysql-dfsg-5.0-5.0.51a/tools/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/tools/Makefile.in	2008-01-11 12:46:26.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/tools/Makefile.in	2008-02-18 16:10:30.518664251 -0300
 @@ -65,6 +65,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42428,9 +42437,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/vio/Makefile.in trunk/vio/Makefile.in
---- trunk~/vio/Makefile.in	2007-11-15 08:08:51.000000000 -0600
-+++ trunk/vio/Makefile.in	2007-12-27 15:54:50.166313697 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/vio/Makefile.in mysql-dfsg-5.0-5.0.51a/vio/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/vio/Makefile.in	2008-01-11 12:46:27.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/vio/Makefile.in	2008-02-18 16:10:30.518664251 -0300
 @@ -65,6 +65,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42439,9 +42448,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/win/Makefile.in trunk/win/Makefile.in
---- trunk~/win/Makefile.in	2007-11-15 08:08:51.000000000 -0600
-+++ trunk/win/Makefile.in	2007-12-27 15:54:50.166313697 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/win/Makefile.in mysql-dfsg-5.0-5.0.51a/win/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/win/Makefile.in	2008-01-11 12:46:27.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/win/Makefile.in	2008-02-18 16:10:30.518664251 -0300
 @@ -62,6 +62,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \
@@ -42450,9 +42459,9 @@
  	$(top_srcdir)/config/ac-macros/ha_federated.m4 \
  	$(top_srcdir)/config/ac-macros/ha_innodb.m4 \
  	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
-diff -urNad trunk~/zlib/Makefile.in trunk/zlib/Makefile.in
---- trunk~/zlib/Makefile.in	2007-11-15 08:08:51.000000000 -0600
-+++ trunk/zlib/Makefile.in	2007-12-27 15:54:50.166313697 -0600
+diff -urNad mysql-dfsg-5.0-5.0.51a~/zlib/Makefile.in mysql-dfsg-5.0-5.0.51a/zlib/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/zlib/Makefile.in	2008-01-11 12:46:28.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/zlib/Makefile.in	2008-02-18 16:10:30.518664251 -0300
 @@ -67,6 +67,7 @@
  	$(top_srcdir)/config/ac-macros/ha_berkeley.m4 \
  	$(top_srcdir)/config/ac-macros/ha_blackhole.m4 \




More information about the Pkg-mysql-commits mailing list