← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.h

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.h
81
81
int prepare_schema_table(Session *session, LEX *lex, Table_ident *table_ident,
82
82
                         const std::string& schema_table_name);
83
83
 
 
84
int prepare_new_schema_table(Session *session, LEX *lex,
 
85
                             const std::string& schema_table_name);
 
86
 
84
87
Item * all_any_subquery_creator(Item *left_expr,
85
88
                                chooser_compare_func_creator cmp,
86
89
                                bool all,