database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Fix failing test cases for MDEV-7912 patch

Browse Source
This commit is contained in:
Vicentiu Ciorbaru
2015-04-29 14:14:45 +03:00
parent a5fa434d0c
commit a4477d2977
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/uniques.cc
View File

@@ -608,8 +608,6 @@ bool Unique::walk(TABLE *table, tree_walk_action action, void *walk_action_arg)
if (flush_io_cache(&file) || reinit_io_cache(&file, READ_CACHE, 0L, 0, 0))
return 1;
size_t buff_sz= (max_in_memory_size / full_size + 1) * full_size;
DBUG_EXECUTE_IF("make_merge_buff_alloc_fail",
DBUG_SET("+d,simulate_out_of_memory"););
if (!(merge_buffer = (uchar *)my_malloc(buff_sz, MYF(MY_WME))))
return 1;
if (buff_sz < (ulong) (full_size * (file_ptrs.elements + 1)))
@@ -739,8 +737,6 @@ bool Unique::get(TABLE *table)
/* Not enough memory; Save the result to file && free memory used by tree */
if (flush())
return 1;
DBUG_EXECUTE_IF("make_merge_buff_alloc_fail",
DBUG_SET("+d,simulate_out_of_memory"););
size_t buff_sz= (max_in_memory_size / full_size + 1) * full_size;
if (!(sort_buffer= (uchar*) my_malloc(buff_sz, MYF(MY_WME))))
return 1;