diff options
| author | unknown <igor@rurik.mysql.com> | 2006-01-06 23:26:20 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-01-06 23:26:20 -0800 |
| commit | bdbf423457f9db207b2b112c5e0bbb5883198a62 (patch) | |
| tree | 8690ae6fd7b60d953390a69cda01f6e971057fe9 /sql | |
| parent | d8dccc31058e8448e18981308395aac890cc4224 (diff) | |
| parent | 312c2f4759514c6594e630e6d1237b8875022328 (diff) | |
| download | mariadb-git-bdbf423457f9db207b2b112c5e0bbb5883198a62.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/opt_sum.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_sum.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 2e87f9cf0db..4158031b9a9 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -180,14 +180,14 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) indexes to find the key. */ Item *expr=item_sum->args[0]; - if (expr->type() == Item::FIELD_ITEM) + if (expr->real_item()->type() == Item::FIELD_ITEM) { byte key_buff[MAX_KEY_LENGTH]; TABLE_REF ref; uint range_fl, prefix_len; ref.key_buff= key_buff; - Item_field *item_field= ((Item_field*) expr); + Item_field *item_field= (Item_field*) (expr->real_item()); TABLE *table= item_field->field->table; /* @@ -267,14 +267,14 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) indexes to find the key. */ Item *expr=item_sum->args[0]; - if (expr->type() == Item::FIELD_ITEM) + if (expr->real_item()->type() == Item::FIELD_ITEM) { byte key_buff[MAX_KEY_LENGTH]; TABLE_REF ref; - uint range_fl, prefix_len; + uint range_fl, prefix_len; ref.key_buff= key_buff; - Item_field *item_field= ((Item_field*) expr); + Item_field *item_field= (Item_field*) (expr->real_item()); TABLE *table= item_field->field->table; /* |