bzr push into mysql-6.0-bugteam branch (Sergey.Glukhov:2800 to 2801)

[Sergey Glukhov]

 2801 Sergey Glukhov	2008-12-11 [merge]
      5.1-bugteam->6.0-bugteam merge
modified:
  tests/mysql_client_test.c

 2800 Mattias Jonsson	2008-12-10 [merge]
      merge
modified:
  mysql-test/t/partition_innodb_stmt.test

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2008-12-10 15:59:12 +0000
+++ b/tests/mysql_client_test.c	2008-12-11 10:52:29 +0000
@@ -17124,6 +17124,7 @@ static void test_change_user()
   DBUG_VOID_RETURN;
 }
 
+#ifdef HAVE_SPATIAL
 /**
   Bug#37956 memory leak and / or crash with geometry and prepared statements! 
 */
@@ -17132,7 +17133,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");
@@ -17176,6 +17177,7 @@ static void test_bug37956(void)
   DIE_UNLESS(0);
   DBUG_VOID_RETURN;
 }
+#endif
 
 /*
   Bug#27592 (stack overrun when storing datetime value using prepared statements)
@@ -18903,7 +18905,9 @@ static struct my_tests_st my_tests[]= {
   { "test_bug38486", test_bug38486 },
   { "test_bug33831", test_bug33831 },
   { "test_bug40365", test_bug40365 },
+#ifdef HAVE_SPATIAL
   { "test_bug37956", test_bug37956 },
+#endif
   { 0, 0 }
 };