From ae949ccdd59255f7f52cc17d201a485e1eb871b6 Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Wed, 13 Jul 2005 15:55:22 +0200
Subject: [PATCH 1/2] 4.1.13 has been cloned off

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

diff --git a/configure.in b/configure.in
index 0889e9a3257..af7ce8b1c3d 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,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, 4.1.13)
+AM_INIT_AUTOMAKE(mysql, 4.1.14)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0
 # ndb version
 NDB_VERSION_MAJOR=4
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=13
+NDB_VERSION_BUILD=14
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From 2dc2ec3ef75f618a2042d10d76c51735e3a2ae7c Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Wed, 13 Jul 2005 18:01:04 +0400
Subject: [PATCH 2/2] Cleanup after test for Bug#11458

---
 mysql-test/r/ps.result | 2 ++
 mysql-test/t/ps.test   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index b1b06dc4019..566dac07fd5 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -620,3 +620,5 @@ execute stmt using @user_id, @id;
 partner_id
 execute stmt using @user_id, @id;
 partner_id
+deallocate prepare stmt;
+drop table t1, t2, t3, t4;
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 24276acf933..a25d4447c20 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -648,4 +648,5 @@ set @user_id = 'nicke';
 set @id = '2';
 execute stmt using @user_id, @id;
 execute stmt using @user_id, @id;
-
+deallocate prepare stmt;
+drop table t1, t2, t3, t4;