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

item_strfunc.cc:

Browse Source 
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
This commit is contained in:
evgen@moonbone.local 2006-06-16 23:46:37 +04:00
parent d22c082b87
commit b8b9738e0b
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sql/item_cmpfunc.cc
View File

@ -83,21 +83,21 @@ static void agg_result_type(Item_result *type, Item **items, uint nitems)
items will be used for aggregation. items will be used for aggregation.
If there are DATE/TIME fields/functions in the list and no string If there are DATE/TIME fields/functions in the list and no string
fields/functions in the list then: fields/functions in the list then:
The INT_RESULT type will be used for aggregation instead of orginal The INT_RESULT type will be used for aggregation instead of original
result type of any DATE/TIME field/function in the list result type of any DATE/TIME field/function in the list
All constant items in the list will be converted to a DATE/TIME using All constant items in the list will be converted to a DATE/TIME using
found field or result field of found function. found field or result field of found function.
Implementation notes: Implementation notes:
The code is equvalent to: The code is equivalent to:
1. Check the list for presense of a STRING field/function. 1. Check the list for presence of a STRING field/function.
Collect the is_const flag. Collect the is_const flag.
2. Get a Field* object to use for type coercion 2. Get a Field* object to use for type coercion
3. Perform type conversion. 3. Perform type conversion.
1 and 2 are implemented in 2 loops. The first searches for a DATE/TIME 1 and 2 are implemented in 2 loops. The first searches for a DATE/TIME
field/function and checks presense of a STRING field/function. field/function and checks presence of a STRING field/function.
The second loop works only if a DATE/TIME field/function is found. The second loop works only if a DATE/TIME field/function is found.
It checks presense of a STRING field/function in the rest of the list. It checks presence of a STRING field/function in the rest of the list.
TODO TODO
1) The current implementation can produce false comparison results for 1) The current implementation can produce false comparison results for
@ -120,8 +120,9 @@ static void agg_result_type(Item_result *type, Item **items, uint nitems)
static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems) static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems)
{ {
uint i; uint i;
Item::Type res; Item::Type res= (Item::Type)0;
char *buff= NULL; /* Used only for date/time fields, max_length = 19 */
char buff[20];
uchar null_byte; uchar null_byte;
Field *field= NULL; Field *field= NULL;
@ -147,28 +148,20 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems)
{ {
field= items[i]->tmp_table_field_from_field_type(0); field= items[i]->tmp_table_field_from_field_type(0);
if (field) if (field)
buff= alloc_root(thd->mem_root, field->max_length());
if (!buff || !field)
{
if (field)
delete field;
if (buff)
my_free(buff, MYF(MY_WME));
field= 0;
}
else
field->move_field(buff, &null_byte, 0); field->move_field(buff, &null_byte, 0);
break; break;
} }
} }
if (field) if (field)
{ {
/* Check the rest of the list for presense of a string field/function. */ /* Check the rest of the list for presence of a string field/function. */
for (i++ ; i < nitems; i++) for (i++ ; i < nitems; i++)
{ {
if (!items[i]->const_item() && items[i]->result_type() == STRING_RESULT && if (!items[i]->const_item() && items[i]->result_type() == STRING_RESULT &&
!items[i]->result_as_longlong()) !items[i]->result_as_longlong())
{ {
if (res == Item::FUNC_ITEM)
delete field;
field= 0; field= 0;
break; break;
} }
@ -205,10 +198,7 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems)
} }
if (res == Item::FUNC_ITEM && field) if (res == Item::FUNC_ITEM && field)
{
delete field; delete field;
my_free(buff, MYF(MY_WME));
}
} }
static void my_coll_agg_error(DTCollation &c1, DTCollation &c2, static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,

3
sql/item_strfunc.cc
View File

@ -274,7 +274,8 @@ String *Item_func_concat::val_str(String *str)
if (!(res=args[0]->val_str(str))) if (!(res=args[0]->val_str(str)))
goto null; goto null;
use_as_buff= &tmp_value; use_as_buff= &tmp_value;
is_const= args[0]->const_item(); /* Item_subselect in --ps-protocol mode will state it as a non-const */
is_const= args[0]->const_item() || !args[0]->used_tables();
for (i=1 ; i < arg_count ; i++) for (i=1 ; i < arg_count ; i++)
{ {
if (res->length() == 0) if (res->length() == 0)