← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Monty Taylor
  • Date: 2008-12-02 08:56:16 UTC
  • mfrom: (629.5.6 remove-strmake)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: mordred@solanthus.local-20081202085616-k1dvv8fly0jt70ho
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
3683
3683
  {
3684
3684
    char command[80];
3685
3685
    Lex_input_stream *lip= session->m_lip;
3686
 
    strmake(command, lip->yylval->symbol.str,
3687
 
            cmin((ulong)lip->yylval->symbol.length, sizeof(command)-1));
 
3686
    strncpy(command, lip->yylval->symbol.str,
 
3687
            cmin((ulong)lip->yylval->symbol.length, sizeof(command)-1));
3688
3688
    my_error(ER_CANT_USE_OPTION_HERE, MYF(0), command);
3689
3689
    return 1;
3690
3690
  }