mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
5.0-bugteam->5.1-bugteam merge
This commit is contained in:
@ -16552,6 +16552,7 @@ static void test_change_user()
|
|||||||
DBUG_VOID_RETURN;
|
DBUG_VOID_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_SPATIAL
|
||||||
/**
|
/**
|
||||||
Bug#37956 memory leak and / or crash with geometry and prepared statements!
|
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(?,?)";
|
const char *query="select point(?,?)";
|
||||||
MYSQL_STMT *stmt=NULL;
|
MYSQL_STMT *stmt=NULL;
|
||||||
unsigned int val=0;
|
ulong val=0;
|
||||||
MYSQL_BIND bind_param[2];
|
MYSQL_BIND bind_param[2];
|
||||||
unsigned char buff[2]= { 134, 211 };
|
unsigned char buff[2]= { 134, 211 };
|
||||||
DBUG_ENTER("test_bug37956");
|
DBUG_ENTER("test_bug37956");
|
||||||
@ -16604,6 +16605,7 @@ static void test_bug37956(void)
|
|||||||
DIE_UNLESS(0);
|
DIE_UNLESS(0);
|
||||||
DBUG_VOID_RETURN;
|
DBUG_VOID_RETURN;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Bug#27592 (stack overrun when storing datetime value using prepared statements)
|
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_wl4166_2", test_wl4166_2 },
|
||||||
{ "test_bug38486", test_bug38486 },
|
{ "test_bug38486", test_bug38486 },
|
||||||
{ "test_bug40365", test_bug40365 },
|
{ "test_bug40365", test_bug40365 },
|
||||||
|
#ifdef HAVE_SPATIAL
|
||||||
{ "test_bug37956", test_bug37956 },
|
{ "test_bug37956", test_bug37956 },
|
||||||
|
#endif
|
||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user