From 68674082ffa1beb43680f846777f407f0f28d08b Mon Sep 17 00:00:00 2001
From: "timothy.smith@sun.com" <>
Date: Fri, 19 Sep 2008 15:48:46 +0200
Subject: [PATCH 1/2] Raise version number after cloning 5.0.70

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index bd993bb5fcf..9822466ae6a 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.70)
+AM_INIT_AUTOMAKE(mysql, 5.0.72)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=70
+NDB_VERSION_BUILD=72
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From b97291d2dc2d10fca61e47c4b4e2d4c1c747faa0 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <kgeorge@mysql.com>
Date: Wed, 1 Oct 2008 12:45:02 +0300
Subject: [PATCH 2/2] fixed a wrong directory in distinct.test

---
 mysql-test/t/distinct.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test
index ff232a61621..2cbd34c0d2c 100644
--- a/mysql-test/t/distinct.test
+++ b/mysql-test/t/distinct.test
@@ -491,12 +491,12 @@ SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
 '../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
 LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
 --error 0,1
---remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp
+--remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp
 
 SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE 
 '../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
 LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
---remove_file $MYSQL_TEST_DIR/var/tmp/data2.tmp
+--remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp
 
 SELECT @v19, @v20;
 SELECT * FROM t2;