← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Mark Atwood
  • Date: 2008-12-29 22:12:25 UTC
  • mfrom: (752 testable)
  • mto: (754.1.4 devel)
  • mto: This revision was merged to the branch mainline in revision 755.
  • Revision ID: me@mark.atwood.name-20081229221225-u2hiic4ztb2mryfn
merge from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
48
48
class LEX_COLUMN;
49
49
class Item_outer_ref;
50
50
 
51
 
#ifdef DRIZZLE_SERVER
52
51
/*
53
52
  The following hack is needed because mysql_yacc.cc does not define
54
53
  YYSTYPE before including this file
55
54
*/
56
55
 
57
 
#include <drizzled/set_var.h>
58
 
#include <drizzled/item/func.h>
59
 
#ifdef DRIZZLE_YACC
60
 
#define LEX_YYSTYPE void *
61
 
#else
62
 
#if defined(DRIZZLE_LEX)
63
 
#include <drizzled/lex_symbol.h>
64
 
#include <drizzled/sql_yacc.h>
65
 
#define LEX_YYSTYPE YYSTYPE *
66
 
#else
67
 
#define LEX_YYSTYPE void *
68
 
#endif
69
 
#endif
70
 
#endif
 
56
#ifdef DRIZZLE_SERVER
 
57
# include <drizzled/set_var.h>
 
58
# include <drizzled/item/func.h>
 
59
# ifdef DRIZZLE_YACC
 
60
#  define LEX_YYSTYPE void *
 
61
# else
 
62
#  if defined(DRIZZLE_LEX)
 
63
#   include <drizzled/lex_symbol.h>
 
64
#   include <drizzled/sql_yacc.h>
 
65
#   define LEX_YYSTYPE YYSTYPE *
 
66
#  else
 
67
#   define LEX_YYSTYPE void *
 
68
#  endif /* defined(DRIZZLE_LEX) */
 
69
# endif /* DRIZZLE_YACC */
 
70
#endif /* DRIZZLE_SERVER */
71
71
 
72
72
// describe/explain types
73
73
#define DESCRIBE_NORMAL         1
849
849
 
850
850
struct st_parsing_options
851
851
{
852
 
  bool allows_variable;
853
 
  bool allows_select_into;
854
852
  bool allows_select_procedure;
855
 
  bool allows_derived;
856
853
 
857
854
  st_parsing_options() { reset(); }
858
855
  void reset();