database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix compile error: ‘cond_copy’ may be used uninitialized in this function.

Browse Source
This commit is contained in:
Sergey Petrunya
2011-10-12 14:23:42 +04:00
parent 2160a25adc
commit 42eeb557a6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@@ -19916,10 +19916,11 @@ static bool add_ref_to_table_cond(THD *thd, JOIN_TAB *join_tab)
cond->fix_fields(thd, &tmp_item); cond->fix_fields(thd, &tmp_item);
DBUG_ASSERT(cond == tmp_item); DBUG_ASSERT(cond == tmp_item);
} }
if (join_tab->select->pre_idx_push_select_cond)
cond_copy= cond->copy_andor_structure(thd);
if (join_tab->select) if (join_tab->select)
{ {
UNINIT_VAR(cond_copy); // used when pre_idx_push_select_cond!=NULL
if (join_tab->select->pre_idx_push_select_cond)
cond_copy= cond->copy_andor_structure(thd);
if (join_tab->select->cond) if (join_tab->select->cond)
error=(int) cond->add(join_tab->select->cond); error=(int) cond->add(join_tab->select->cond);
join_tab->select->cond= cond; join_tab->select->cond= cond;