← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
291
291
    yacc_yyvs= 0;
292
292
  }
293
293
 
294
 
  delete result;
295
 
  delete _create_table;
 
294
  safe_delete(result);
 
295
  safe_delete(_create_table);
296
296
  _create_table= NULL;
297
297
  _create_field= NULL;
298
298
 
299
299
  result= 0;
300
300
  setCacheable(true);
301
301
 
302
 
  delete statement;
303
 
  statement= NULL;
 
302
  safe_delete(statement);
304
303
}
305
304
 
306
305
static int find_keyword(Lex_input_stream *lip, uint32_t len, bool function)
388
387
*/
389
388
static char *get_text(Lex_input_stream *lip, int pre_skip, int post_skip)
390
389
{
391
 
  register unsigned char c,sep;
 
390
  unsigned char c,sep;
392
391
  bool found_escape= false;
393
392
  const CHARSET_INFO * const cs= lip->m_session->charset();
394
393
 
665
664
 
666
665
int lex_one_token(ParserType *yylval, drizzled::Session *session)
667
666
{
668
 
  register unsigned char c= 0; /* Just set to shutup GCC */
 
667
  unsigned char c= 0; /* Just set to shutup GCC */
669
668
  bool comment_closed;
670
669
  int   tokval, result_state;
671
670
  unsigned int length;