diff options
| author | unknown <konstantin@mysql.com> | 2003-11-05 14:35:20 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2003-11-05 14:35:20 +0300 |
| commit | f00310a62231a011eef8b8066314eb5f4e6b6a9e (patch) | |
| tree | ae3118b452d9f3703a3b04fb92d63d4edbc3f3c4 /sql/item_cmpfunc.cc | |
| parent | 61e682b8adafdfae736327fee4ea0263e1a0bd37 (diff) | |
| parent | 9c8d73c72898e35fafd83a56e7f9bc814e514d53 (diff) | |
| download | mariadb-git-f00310a62231a011eef8b8066314eb5f4e6b6a9e.tar.gz | |
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
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 1ec1a19382d..8731e8fbe21 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -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; |