Commit a14009a0 authored by Satya Bodapati's avatar Satya Bodapati

Merge Post Fix for BUG#14628410 from mysql-5.1 to mysql-5.5

parents f589425b 1de6ac5b
...@@ -2731,6 +2731,14 @@ row_merge_build_indexes( ...@@ -2731,6 +2731,14 @@ row_merge_build_indexes(
block_size = 3 * sizeof *block; block_size = 3 * sizeof *block;
block = os_mem_alloc_large(&block_size); block = os_mem_alloc_large(&block_size);
/* Initialize all the merge file descriptors, so that we
don't call row_merge_file_destroy() on uninitialized
merge file descriptor */
for (i = 0; i < n_indexes; i++) {
merge_files[i].fd = -1;
}
for (i = 0; i < n_indexes; i++) { for (i = 0; i < n_indexes; i++) {
if (row_merge_file_create(&merge_files[i]) < 0) if (row_merge_file_create(&merge_files[i]) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment