diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /sql/sql_partition.cc | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index b72816f8ce3..9ab4e0c5226 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1105,8 +1105,9 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, saved_full_group_by_flag= thd->lex->current_select->full_group_by_flag; saved_allow_sum_func= thd->lex->allow_sum_func; thd->lex->allow_sum_func= 0; - - error= func_expr->fix_fields(thd, (Item**)&func_expr); + + if (!(error= func_expr->fix_fields(thd, (Item**)&func_expr))) + func_expr->walk(&Item::vcol_in_partition_func_processor, 0, NULL); /* Restore full_group_by_flag and allow_sum_func, @@ -2032,7 +2033,7 @@ static int add_int(File fptr, longlong number) static int add_uint(File fptr, ulonglong number) { char buff[32]; - longlong2str(number, buff, 10); + longlong2str(number, buff, 10, 1); return add_string(fptr, buff); } @@ -7853,8 +7854,8 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter) field->store(part_iter->field_vals.cur++, ((Field_num*)field)->unsigned_flag); if ((part_iter->part_info->is_sub_partitioned() && - !part_iter->part_info->get_part_partition_id(part_iter->part_info, - &part_id, &dummy)) || + !part_iter->part_info->get_part_partition_id(part_iter->part_info, + &part_id, &dummy)) || !part_iter->part_info->get_partition_id(part_iter->part_info, &part_id, &dummy)) return part_id; @@ -7975,4 +7976,3 @@ uint get_partition_field_store_length(Field *field) return store_length; } #endif - |