diff options
| author | wax@mysql.com <> | 2003-09-04 06:13:21 +0600 |
|---|---|---|
| committer | wax@mysql.com <> | 2003-09-04 06:13:21 +0600 |
| commit | f053ce32396e1281e05a5238e55b47ac1b5ee726 (patch) | |
| tree | ddccb5b947a6a56607578e0f2ff462d8f59642ff /sql/item_sum.cc | |
| parent | fbbc9a00af510e69cdb7b99b6ad391079eb9dde2 (diff) | |
| parent | 523187296d082c07c3943ec29fc068e57456ce2a (diff) | |
| download | mariadb-git-f053ce32396e1281e05a5238e55b47ac1b5ee726.tar.gz | |
merge
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 84cb7eade05..07e62ae35de 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1460,7 +1460,7 @@ int group_concat_key_cmp_with_distinct(void* arg, byte* key1, for (uint i= 0; i < item->arg_count_field; i++) { Item *field_item= item->args[i]; - Field *field= field_item->get_tmp_table_field(); + Field *field= field_item->real_item()->tmp_table_field(); if (field) { uint offset= field->abs_offset; @@ -1491,7 +1491,7 @@ int group_concat_key_cmp_with_order(void* arg, byte* key1, byte* key2) { ORDER *order_item= item->order[i]; Item *item= *order_item->item; - Field *field= item->get_tmp_table_field(); + Field *field= item->real_item()->tmp_table_field(); if (field) { uint offset= field->abs_offset; @@ -1542,7 +1542,7 @@ int dump_leaf_key(byte* key, uint32 count __attribute__((unused)), Item *show_item= group_concat_item->args[i]; if (!show_item->const_item()) { - Field *f= show_item->get_tmp_table_field(); + Field *f= show_item->real_item()->tmp_table_field(); char *sv= f->ptr; f->ptr= (char *)key + f->abs_offset; String *res= f->val_str(&tmp,&tmp2); @@ -1709,7 +1709,7 @@ bool Item_func_group_concat::add() Item *show_item= args[i]; if (!show_item->const_item()) { - Field *f= show_item->get_tmp_table_field(); + Field *f= show_item->real_item()->tmp_table_field(); if (!f->is_null()) { record_is_null= FALSE; |