← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
397
397
{
398
398
  unsigned char c,sep;
399
399
  bool found_escape= false;
400
 
  const CHARSET_INFO * const cs= lip->m_session->charset();
 
400
  const charset_info_st * const cs= lip->m_session->charset();
401
401
 
402
402
  lip->tok_bitmap= 0;
403
403
  sep= lip->yyGetLast();                        // String should end with this
679
679
  enum my_lex_states state;
680
680
  Lex_input_stream *lip= session->m_lip;
681
681
  LEX *lex= &session->lex();
682
 
  const CHARSET_INFO * const cs= session->charset();
 
682
  const charset_info_st * const cs= session->charset();
683
683
  unsigned char *state_map= cs->state_map;
684
684
  unsigned char *ident_map= cs->ident_map;
685
685
 
1303
1303
  }
1304
1304
}
1305
1305
 
1306
 
void trim_whitespace(const CHARSET_INFO * const cs, LEX_STRING *str)
 
1306
void trim_whitespace(const charset_info_st * const cs, LEX_STRING *str)
1307
1307
{
1308
1308
  /*
1309
1309
    TODO: