diff options
| author | unknown <gluh@eagle.(none)> | 2007-01-12 14:48:59 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-01-12 14:48:59 +0400 |
| commit | 5a80954670ef5bc89e0150b05f38d6c3a292e914 (patch) | |
| tree | 7ceeafeb98f892ac7ca095140d09cf5699606bf5 /sql/item.cc | |
| parent | cf76bb5118f65394228102579e7ba6fa039cad85 (diff) | |
| parent | 7f9da471cd5f0b2b04242c4905aa45b049de59dc (diff) | |
| download | mariadb-git-5a80954670ef5bc89e0150b05f38d6c3a292e914.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/order_by.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/r/join.result:
manual merge
mysql-test/t/join.test:
manual merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 309fdcfa030..83be426d8b5 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3732,6 +3732,8 @@ bool Item_field::fix_fields(THD *thd, Item **reference) Item** res= find_item_in_list(this, thd->lex->current_select->item_list, &counter, REPORT_EXCEPT_NOT_FOUND, ¬_used); + if (!res) + return 1; if (res != (Item **)not_found_item) { if ((*res)->type() == Item::FIELD_ITEM) |