← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • Committer: Stewart Smith
  • Date: 2010-02-15 01:56:32 UTC
  • mto: (1273.13.96 build)
  • mto: This revision was merged to the branch mainline in revision 1308.
  • Revision ID: stewart@flamingspork.com-20100215015632-pm7lnxfq5j5uh8kj
move DATABASE() to function plugin. modify parser so that it looks for a function named 'database' when DATABASE() is called. Special case still needed in parser due to hilarity of not-really-reserved words.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
524
524
    if (session->lex->describe)
525
525
    {
526
526
      char warn_buff[DRIZZLE_ERRMSG_SIZE];
527
 
      snprintf(warn_buff, sizeof(warn_buff), ER(ER_SELECT_REDUCED), select_lex->select_number);
 
527
      sprintf(warn_buff, ER(ER_SELECT_REDUCED), select_lex->select_number);
528
528
      push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
529
529
                   ER_SELECT_REDUCED, warn_buff);
530
530
    }
1320
1320
        if (session->lex->describe)
1321
1321
        {
1322
1322
          char warn_buff[DRIZZLE_ERRMSG_SIZE];
1323
 
          snprintf(warn_buff, sizeof(warn_buff), ER(ER_SELECT_REDUCED), select_lex->select_number);
 
1323
          sprintf(warn_buff, ER(ER_SELECT_REDUCED), select_lex->select_number);
1324
1324
          push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1325
1325
                       ER_SELECT_REDUCED, warn_buff);
1326
1326
        }