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

Merged fix for uninitialized variables.

Browse Source
This commit is contained in:
Sergey Vojtovich 2013-07-31 15:02:11 +04:00
commit 159866b6d3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -16137,6 +16137,8 @@ create_internal_tmp_table_from_heap(THD *thd, TABLE *table,
const char *save_proc_info; const char *save_proc_info;
int write_err= 0; int write_err= 0;
DBUG_ENTER("create_internal_tmp_table_from_heap"); DBUG_ENTER("create_internal_tmp_table_from_heap");
if (is_duplicate)
*is_duplicate= FALSE;
if (table->s->db_type() != heap_hton || if (table->s->db_type() != heap_hton ||
error != HA_ERR_RECORD_FILE_FULL) error != HA_ERR_RECORD_FILE_FULL)

2
sql/sql_union.cc
View File

@ -83,7 +83,7 @@ int select_union::send_data(List<Item> &values)
*/ */
return -1; return -1;
} }
bool is_duplicate; bool is_duplicate= FALSE;
/* create_internal_tmp_table_from_heap will generate error if needed */ /* create_internal_tmp_table_from_heap will generate error if needed */
if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) && if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) &&
create_internal_tmp_table_from_heap(thd, table, create_internal_tmp_table_from_heap(thd, table,