diff options
| author | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
| commit | 44289ba6587b7a2151b4bd3aa7bd5f3b282454d5 (patch) | |
| tree | dbb4c85840636d99a9d0ab51a698645946f49c1e /sql/item_cmpfunc.h | |
| parent | e5ab70702c082c77401052f940b18b5f6d50a8c3 (diff) | |
| parent | 0db0b601abb3be2fdafa612583f4e03360876236 (diff) | |
| download | mariadb-git-44289ba6587b7a2151b4bd3aa7bd5f3b282454d5.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 7079fcf193d..7e1749ef7a0 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -929,7 +929,7 @@ public: Item* copy_andor_structure(THD *thd) { Item_cond_and *item; - if((item= new Item_cond_and(thd, this))) + if ((item= new Item_cond_and(thd, this))) item->copy_andor_arguments(thd, this); return item; } @@ -950,7 +950,7 @@ public: Item* copy_andor_structure(THD *thd) { Item_cond_or *item; - if((item= new Item_cond_or(thd, this))) + if ((item= new Item_cond_or(thd, this))) item->copy_andor_arguments(thd, this); return item; } |