diff options
| author | unknown <konstantin@oak.local> | 2003-10-31 17:52:00 +0300 |
|---|---|---|
| committer | unknown <konstantin@oak.local> | 2003-10-31 17:52:00 +0300 |
| commit | 9c8d73c72898e35fafd83a56e7f9bc814e514d53 (patch) | |
| tree | 715883a51ea9c662835b72ee24d1326f48d76f02 /sql/item_cmpfunc.cc | |
| parent | 4a3553ed5cb62ce2dc9e515297ffbeaecb666a80 (diff) | |
| download | mariadb-git-9c8d73c72898e35fafd83a56e7f9bc814e514d53.tar.gz | |
follow-up to Sanja fix:
fix_fields() never accepts (THD *)(0)
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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; |