From 87ea5307d0750d33aec28bf7613a5b80c5c0dac2 Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Thu, 11 Dec 2008 12:57:59 +0400
Subject: [PATCH 1/2] disable bug37956 test if geometry package is not enabled

---
 tests/mysql_client_test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index ea4d363bdac..79d188c252c 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15899,6 +15899,7 @@ static void test_bug28934()
 }
 
 
+#ifdef HAVE_SPATIAL
 /**
   Bug#37956 memory leak and / or crash with geometry and prepared statements! 
 */
@@ -15951,6 +15952,7 @@ static void test_bug37956(void)
   DIE_UNLESS(0);
   DBUG_VOID_RETURN;
 }
+#endif
 
 /*
   Bug#27592 (stack overrun when storing datetime value using prepared statements)
@@ -16648,7 +16650,9 @@ static struct my_tests_st my_tests[]= {
   { "test_bug32265", test_bug32265 },
   { "test_bug38486", test_bug38486 },
   { "test_bug40365", test_bug40365 },
+#ifdef HAVE_SPATIAL
   { "test_bug37956", test_bug37956 },
+#endif
   { 0, 0 }
 };
 

From e419c5d349997835644f1b438e90a4af61694a62 Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Thu, 11 Dec 2008 14:37:18 +0400
Subject: [PATCH 2/2] fix for pushbuild failure on 64 linux

---
 tests/mysql_client_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 79d188c252c..50f03a1a086 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15908,7 +15908,7 @@ static void test_bug37956(void)
 {
   const char *query="select point(?,?)";
   MYSQL_STMT *stmt=NULL;
-  unsigned int val=0;
+  ulong val=0;
   MYSQL_BIND bind_param[2];
   unsigned char buff[2]= { 134, 211 };
   DBUG_ENTER("test_bug37956");