diff options
| author | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-04-29 14:14:45 +0300 |
|---|---|---|
| committer | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-04-29 14:16:03 +0300 |
| commit | a4477d297728c18cbd25f10d71ea946356e54bfd (patch) | |
| tree | e782cded034481abb7fb495b6c7ec7b1a2dc79de /sql/uniques.cc | |
| parent | a5fa434d0cec39b0db9f67ae2d6a824e2e53e39d (diff) | |
| download | mariadb-git-a4477d297728c18cbd25f10d71ea946356e54bfd.tar.gz | |
Fix failing test cases for MDEV-7912 patch
Diffstat (limited to 'sql/uniques.cc')
| -rw-r--r-- | sql/uniques.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/uniques.cc b/sql/uniques.cc index 455fe205717..fe3e329cda6 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -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; |