1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post Fix to Bug#14628410 - ASSERTION `! IS_SET()' FAILED IN

Browse Source 
DIAGNOSTICS_AREA::SET_OK_STATUS

Test fails on 5.1 valgrind build. This is because of close(-1)
system call.

Fixed by adding extra checks for valid file descriptor.

Approved by Vasil(Calvin). rb#1792
This commit is contained in:
Satya Bodapati 2013-01-04 17:30:39 +05:30
parent 138217a201
commit 1de6ac5b32
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/innodb_plugin/row/row0merge.c
View File

@ -2642,6 +2642,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)
@ -2699,7 +2707,9 @@ row_merge_build_indexes(
} }
func_exit: func_exit:
close(tmpfd); if (tmpfd >= 0) {
close(tmpfd);
}
for (i = 0; i < n_indexes; i++) { for (i = 0; i < n_indexes; i++) {
row_merge_file_destroy(&merge_files[i]); row_merge_file_destroy(&merge_files[i]);