← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

  • Committer: Lee Bieber
  • Date: 2011-01-12 02:31:03 UTC
  • mfrom: (2068.7.5 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2076.
  • Revision ID: kalebral@gmail.com-20110112023103-nmz26cv1j32jc6n3
Merge Brian - fix bug 527084 - DROP TABLE: getTableDefiniton returns EEXIST but doDropTable returns ENOENT leads to SIGSEGV

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
84
84
      args= tmp_arg;
85
85
    else
86
86
    {
87
 
      if (!(args=(Item**) session->getMemRoot()->allocate(sizeof(Item*)*arg_count)))
 
87
      if (!(args=(Item**) session->alloc(sizeof(Item*)*arg_count)))
88
88
        return;
89
89
    }
90
90
    memcpy(args, item->args, sizeof(Item*)*arg_count);
435
435
}
436
436
 
437
437
 
438
 
bool Item_func::get_arg0_date(type::Time &ltime, uint32_t fuzzy_date)
 
438
bool Item_func::get_arg0_date(type::Time *ltime, uint32_t fuzzy_date)
439
439
{
440
440
  return (null_value=args[0]->get_date(ltime, fuzzy_date));
441
441
}
442
442
 
443
443
 
444
 
bool Item_func::get_arg0_time(type::Time &ltime)
 
444
bool Item_func::get_arg0_time(type::Time *ltime)
445
445
{
446
446
  return (null_value= args[0]->get_time(ltime));
447
447
}