database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

DBUG_ASSERT(fixed == 0) added to fix_fields()

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-03-17 14:26:26 +02:00
parent b8c065c527
commit 8035ce40ec
18 changed files with 296 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_union.cc
View File

@ -203,6 +203,8 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
}
}
item_list.empty();
// it is not single select
if (first_select->next_select())
{
union_result->tmp_table_param.field_count= types.elements;
@ -222,14 +224,17 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
result_table_list.table= table;
union_result->set_table(table);
item_list.empty();
thd_arg->lex->current_select= lex_select_save;
{
Field **field;
for (field= table->field; *field; field++)
{
if (item_list.push_back(new Item_field(*field)))
Item_field *item= new Item_field(*field);
if (item_list.push_back(item))
DBUG_RETURN(-1);
#ifndef DBUG_OFF
item->double_fix= 0;
#endif
}
}
}