diff options
| author | Satya Bodapati <satya.bodapati@oracle.com> | 2013-01-04 17:34:02 +0530 |
|---|---|---|
| committer | Satya Bodapati <satya.bodapati@oracle.com> | 2013-01-04 17:34:02 +0530 |
| commit | d95914b64815aa07e97c745d15eb2e6bc2aecff1 (patch) | |
| tree | 4594ebb6b40cd4bd4f861ede7ed9a21940e133e4 /storage | |
| parent | 31a720abbdc27ddaa0f2379393cb0c6cf5e30181 (diff) | |
| parent | eab9f8f4f40a5deb7012a53b35ec5ffaf5ec49d9 (diff) | |
| download | mariadb-git-d95914b64815aa07e97c745d15eb2e6bc2aecff1.tar.gz | |
Merge Post Fix for BUG#14628410 from mysql-5.1 to mysql-5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0merge.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c index 1ca0be34ba9..d34ad467588 100644 --- a/storage/innobase/row/row0merge.c +++ b/storage/innobase/row/row0merge.c @@ -2731,6 +2731,14 @@ row_merge_build_indexes( block_size = 3 * sizeof *block; 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++) { if (row_merge_file_create(&merge_files[i]) < 0) |