mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix after manual merge.

Browse source
This commit is contained in:
kroki/tomash@moonlight.intranet 2006-07-29 13:50:08 +04:00
parent 5c90b6f810
commit cc98d26a23
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysys/my_bitmap.c
View file

@ -445,7 +445,7 @@ uint bitmap_get_first(const MY_BITMAP *map)
{
uchar *bitmap=map->bitmap;
uint bit_found = MY_BIT_NONE;
uint bitmap_size=map->bitmap_size*8;
uint bitmap_size=map->bitmap_size;
uint i;
DBUG_ASSERT(map->bitmap);

44
tests/mysql_client_test.c
View file

@ -15028,6 +15028,49 @@ static void test_bug20152()
}
/*
Bug#21206: memory corruption when too many cursors are opened at once
Memory corruption happens when more than 1024 cursors are open
simultaneously.
*/
static void test_bug21206()
{
const size_t cursor_count= 1025;
const char *create_table[]=
{
"DROP TABLE IF EXISTS t1",
"CREATE TABLE t1 (i INT)",
"INSERT INTO t1 VALUES (1), (2), (3)"
};
const char *query= "SELECT * FROM t1";
Stmt_fetch *fetch_array=
(Stmt_fetch*) calloc(cursor_count, sizeof(Stmt_fetch));
Stmt_fetch *fetch;
DBUG_ENTER("test_bug21206");
myheader("test_bug21206");
fill_tables(create_table, sizeof(create_table) / sizeof(*create_table));
for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch)
{
/* Init will exit(1) in case of error */
stmt_fetch_init(fetch, fetch - fetch_array, query);
}
for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch)
stmt_fetch_close(fetch);
free(fetch_array);
DBUG_VOID_RETURN;
}
/*
Read and parse arguments and MySQL options from my.cnf
*/
@ -15300,6 +15343,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14169", test_bug14169 },
{ "test_bug17667", test_bug17667 },
{ "test_bug19671", test_bug19671},
{ "test_bug21206", test_bug21206},
{ 0, 0 }
};