~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

Remove PLUGIN and MODULES.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
/* A lexical scanner on a temporary buffer with a yacc interface */
18
18
 
19
19
#define DRIZZLE_LEX 1
20
 
#include "drizzled/server_includes.h"
 
20
#include "config.h"
21
21
#include "drizzled/configmake.h"
22
22
#include "drizzled/item/num.h"
23
23
#include "drizzled/error.h"
409
409
      assert(end >= str);
410
410
 
411
411
      if (!(start= (char*) lip->m_session->alloc((uint32_t) (end-str)+1)))
412
 
        return (char*) "";              // Sql_alloc has set error flag
 
412
        return (char*) "";              // memory::SqlAlloc has set error flag
413
413
 
414
414
      lip->m_cpp_text_start= lip->get_cpp_tok_start() + pre_skip;
415
415
      lip->m_cpp_text_end= lip->get_cpp_ptr() - post_skip;
1352
1352
{
1353
1353
  sj_nests.empty();
1354
1354
  group_list.empty();
1355
 
  type= db= 0;
 
1355
  db= 0;
1356
1356
  having= 0;
1357
1357
  table_join_options= 0;
1358
1358
  in_sum_expr= with_wild= 0;