From 9c8d73c72898e35fafd83a56e7f9bc814e514d53 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 31 Oct 2003 17:52:00 +0300 Subject: follow-up to Sanja fix: fix_fields() never accepts (THD *)(0) --- sql/item_cmpfunc.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/item_cmpfunc.cc') diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d6c05f47964..407678ac805 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1614,7 +1614,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++)) { @@ -1643,8 +1643,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; -- cgit v1.2.1