diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-02-01 11:05:29 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-02-01 11:05:29 +0200 |
| commit | 9fe76ad98bb536990cafbfcaef3942ceba7981a6 (patch) | |
| tree | b629002da53b22fca92236e5c9434ff87b1ec628 /sql/item.cc | |
| parent | 99620cecd8eb66ffdc21c4569cb86900f311548d (diff) | |
| parent | 755c9aabe27eaf0587b6f8331e1d688e855e6ed1 (diff) | |
| download | mariadb-git-9fe76ad98bb536990cafbfcaef3942ceba7981a6.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8c45dffce75..ab29c147dfb 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1482,12 +1482,13 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) } else if (refer != (Item **)not_found_item) { - if (!(*refer)->fixed) + if (!last->ref_pointer_array[counter]) { my_error(ER_ILLEGAL_REFERENCE, MYF(0), name, "forward reference in item list"); return -1; } + DBUG_ASSERT((*refer)->fixed); /* Here, a subset of actions performed by Item_ref::set_properties is not enough. So we pass ptr to NULL into Item_[direct]_ref @@ -2161,12 +2162,13 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) mark_as_dependent(thd, last, thd->lex->current_select, fld); return 0; } - if (!(*ref)->fixed) + if (!last->ref_pointer_array[counter]) { my_error(ER_ILLEGAL_REFERENCE, MYF(0), name, "forward reference in item list"); return -1; } + DBUG_ASSERT((*ref)->fixed); mark_as_dependent(thd, last, thd->lex->current_select, this); if (place == IN_HAVING) |