mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
This commit is contained in:
konstantin@mysql.com 2003-11-05 14:35:20 +03:00
commit eb3c90095a
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/item.cc
View file

@ -938,7 +938,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
set_field(tmp);
}
else if (thd && thd->set_query_id && field->query_id != thd->query_id)
else if (thd->set_query_id && field->query_id != thd->query_id)
{
/* We only come here in unions */
TABLE *table=field->table;

5
sql/item_cmpfunc.cc
View file

@ -1667,7 +1667,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
*/
and_tables_cache= ~(table_map) 0;
if (thd && check_stack_overrun(thd,buff))
if (check_stack_overrun(thd, buff))
return 1; // Fatal error flag is set!
while ((item=li++))
{
@ -1696,8 +1696,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
if (item->maybe_null)
maybe_null=1;
}
if (thd)
thd->lex.current_select->cond_count+=list.elements;
thd->lex.current_select->cond_count+=list.elements;
fix_length_and_dec();
fixed= 1;
return 0;

14
sql/item_func.cc
View file

@ -197,7 +197,7 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
used_tables_cache= not_null_tables_cache= 0;
const_item_cache=1;
if (thd && check_stack_overrun(thd,buff))
if (check_stack_overrun(thd, buff))
return 1; // Fatal error if flag is set!
if (arg_count)
{ // Print purify happy
@ -219,7 +219,7 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
}
}
fix_length_and_dec();
if (thd && thd->net.last_errno) // An error inside fix_length_and_dec accured
if (thd->net.last_errno) // An error inside fix_length_and_dec occured
return 1;
fixed= 1;
return 0;
@ -1435,13 +1435,9 @@ udf_handler::fix_fields(THD *thd, TABLE_LIST *tables, Item_result_field *func,
#endif
DBUG_ENTER("Item_udf_func::fix_fields");
if (thd)
{
if (check_stack_overrun(thd,buff))
DBUG_RETURN(1); // Fatal error flag is set!
}
else
thd=current_thd; // In WHERE / const clause
if (check_stack_overrun(thd, buff))
DBUG_RETURN(1); // Fatal error flag is set!
udf_func *tmp_udf=find_udf(u_d->name.str,(uint) u_d->name.length,1);
if (!tmp_udf)