diff options
| author | unknown <monty@mishka.local> | 2005-05-06 13:51:58 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-05-06 13:51:58 +0300 |
| commit | f43c58178159aeef3a5aea22390238aeb9b1e772 (patch) | |
| tree | 4ae68ee5fcd5cdd54cefba299cab2ccb0e57f806 /sql/item.cc | |
| parent | 0b2ae60c6220b01411a293c5a439605b2672a50b (diff) | |
| parent | ab54e167052bb03f7f25cb071ee75f4f26caf68f (diff) | |
| download | mariadb-git-f43c58178159aeef3a5aea22390238aeb9b1e772.tar.gz | |
merge
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/key.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index f5c7f2d7c05..68a091de3ef 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -510,10 +510,10 @@ bool Item_field::collect_item_field_processor(byte *arg) while ((curr_item= item_list_it++)) { if (curr_item->eq(this, 1)) - DBUG_RETURN(false); /* Already in the set. */ + DBUG_RETURN(FALSE); /* Already in the set. */ } item_list->push_back(this); - DBUG_RETURN(false); + DBUG_RETURN(FALSE); } |