← 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-03-03 19:19:28 UTC
  • mfrom: (2216.1.3 build)
  • Revision ID: kalebral@gmail.com-20110303191928-h2kris5kavbgmzu0
Merge Shrews - 728432: Remove write_bin_log() since it is no longer used.
Merge Andrew - 722988: wrong message for drizzled --verbose 
Merge Andrew - 728314: mysql socket file not created
Merge Stewart - 728288: enum_query_type is unused

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
448
448
}
449
449
 
450
450
 
451
 
void Item_func::print(String *str, enum_query_type query_type)
 
451
void Item_func::print(String *str)
452
452
{
453
453
  str->append(func_name());
454
454
  str->append('(');
455
 
  print_args(str, 0, query_type);
 
455
  print_args(str, 0);
456
456
  str->append(')');
457
457
}
458
458
 
459
459
 
460
 
void Item_func::print_args(String *str, uint32_t from, enum_query_type query_type)
 
460
void Item_func::print_args(String *str, uint32_t from)
461
461
{
462
462
  for (uint32_t i=from ; i < arg_count ; i++)
463
463
  {
464
464
    if (i != from)
465
465
      str->append(',');
466
 
    args[i]->print(str, query_type);
 
466
    args[i]->print(str);
467
467
  }
468
468
}
469
469
 
470
470
 
471
 
void Item_func::print_op(String *str, enum_query_type query_type)
 
471
void Item_func::print_op(String *str)
472
472
{
473
473
  str->append('(');
474
474
  for (uint32_t i=0 ; i < arg_count-1 ; i++)
475
475
  {
476
 
    args[i]->print(str, query_type);
 
476
    args[i]->print(str);
477
477
    str->append(' ');
478
478
    str->append(func_name());
479
479
    str->append(' ');
480
480
  }
481
 
  args[arg_count-1]->print(str, query_type);
 
481
  args[arg_count-1]->print(str);
482
482
  str->append(')');
483
483
}
484
484