summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2008-12-11 14:49:56 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2008-12-11 14:49:56 +0400
commit54f65ef151cb868d1c214c5a91f0c7820e7e86ba (patch)
tree9f5788a353aa64aeda7e5412760840c785ce1665 /tests
parent207d519a080e6df0d2ec57a1abc784f2043f366c (diff)
parentd2cd545b53397f36572001def335cf75c86570cf (diff)
downloadmariadb-git-54f65ef151cb868d1c214c5a91f0c7820e7e86ba.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 54fd71b6de3..5f04dc48b4c 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -16552,6 +16552,7 @@ static void test_change_user()
DBUG_VOID_RETURN;
}
+#ifdef HAVE_SPATIAL
/**
Bug#37956 memory leak and / or crash with geometry and prepared statements!
*/
@@ -16560,7 +16561,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");
@@ -16604,6 +16605,7 @@ static void test_bug37956(void)
DIE_UNLESS(0);
DBUG_VOID_RETURN;
}
+#endif
/*
Bug#27592 (stack overrun when storing datetime value using prepared statements)
@@ -18020,7 +18022,9 @@ static struct my_tests_st my_tests[]= {
{ "test_wl4166_2", test_wl4166_2 },
{ "test_bug38486", test_bug38486 },
{ "test_bug40365", test_bug40365 },
+#ifdef HAVE_SPATIAL
{ "test_bug37956", test_bug37956 },
+#endif
{ 0, 0 }
};