mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0

Browse source 
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
This commit is contained in:
unknown 2006-01-06 23:26:20 -08:00
commit bdbf423457
3 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/opt_sum.cc
View file

@ -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;
/*