← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/parser.h

  • Committer: Brian Aker
  • Date: 2011-01-25 07:24:41 UTC
  • mfrom: (2104.3.14 alter-table)
  • Revision ID: brian@tangent.org-20110125072441-gf9f14lkxjhvvku9
Merge in alter/parser

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/parser.h
126
126
 
127
127
namespace parser {
128
128
 
129
 
struct error_t {
130
 
  const char *s;
131
 
  Session *session;
132
 
};
133
 
 
134
129
Item* handle_sql2003_note184_exception(Session *session, Item* left, bool equal, Item *expr);
135
130
bool add_select_to_union_list(Session *session, LEX *lex, bool is_union_distinct);
136
131
bool setup_select_in_parentheses(Session *session, LEX *lex);
137
132
Item* reserved_keyword_function(Session *session, const std::string &name, List<Item> *item_list);
138
 
void my_parse_error(parser::error_t &arg);
 
133
void my_parse_error(Lex_input_stream *lip);
 
134
void my_parse_error(const char *message);
139
135
bool check_reserved_words(LEX_STRING *name);
 
136
void errorOn(const char *s);
 
137
bool buildOrderBy(Session *session);
140
138
 
141
139
} // namespace parser
142
140
} // namespace drizzled