← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Monty Taylor
  • Date: 2009-12-29 18:26:43 UTC
  • mfrom: (1257 build)
  • mto: This revision was merged to the branch mainline in revision 1258.
  • Revision ID: mordred@inaugust.com-20091229182643-bv3c4va7rit6wmvl
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
427
427
                            str + length - orig_len);
428
428
    }
429
429
  }
430
 
  name= sql_strmake(str, length);
 
430
  name= memory::sql_strmake(str, length);
431
431
}
432
432
 
433
433
bool Item::eq(const Item *item, bool) const
1421
1421
    return; /* Can't be better */
1422
1422
  Item_result res_type=item_cmp_type(comp_item->result_type(),
1423
1423
                                     item->result_type());
1424
 
  char *name=item->name; /* Alloced by sql_alloc */
 
1424
  char *name=item->name; /* Alloced by memory::sql_alloc */
1425
1425
 
1426
1426
  switch (res_type) {
1427
1427
  case STRING_RESULT:
1434
1434
    else
1435
1435
    {
1436
1436
      uint32_t length= result->length();
1437
 
      char *tmp_str= sql_strmake(result->ptr(), length);
 
1437
      char *tmp_str= memory::sql_strmake(result->ptr(), length);
1438
1438
      new_item= new Item_string(name, tmp_str, length, result->charset());
1439
1439
    }
1440
1440
    break;