1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge fix/

Browse Source
This commit is contained in:
ramil@mysql.com 2005-03-30 18:57:56 +05:00
parent 36bb01016c
commit 8098ef79f0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_sum.cc
View File

@ -311,8 +311,8 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table,
{ {
Field *field= ((Item_field*) args[0])->field; Field *field= ((Item_field*) args[0])->field;
if ((field= create_tmp_field_from_field(current_thd, field, this, table, if ((field= create_tmp_field_from_field(current_thd, field, name, table,
0, convert_blob_length))) NULL, convert_blob_length)))
field->flags&= ~NOT_NULL_FLAG; field->flags&= ~NOT_NULL_FLAG;
return field; return field;
} }

5
sql/sql_select.h
View File

@ -402,9 +402,8 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
int error, bool ignore_last_dupp_error); int error, bool ignore_last_dupp_error);
uint find_shortest_key(TABLE *table, const key_map *usable_keys); uint find_shortest_key(TABLE *table, const key_map *usable_keys);
Field* create_tmp_field_from_field(THD *thd, Field* org_field, Field* create_tmp_field_from_field(THD *thd, Field* org_field,
Item *item, TABLE *table, const char *name, TABLE *table,
bool modify_item, Item_field *item, uint convert_blob_length);
uint convert_blob_length);
/* functions from opt_sum.cc */ /* functions from opt_sum.cc */
bool simple_pred(Item_func *func_item, Item **args, bool *inv_order); bool simple_pred(Item_func *func_item, Item **args, bool *inv_order);