Manual merge

sql/sp_head.cc:
  Manual merge, bug#27876
sql/sql_lex.cc:
  Manual merge, bug#27876
sql/sql_lex.h:
  Manual merge, bug#27876
sql/sql_view.cc:
  Manual merge, bug#27876
tests/mysql_client_test.c:
  Manual merge, bug#27876
This commit is contained in:
unknown 2007-05-29 14:52:17 -06:00
commit 5817bdffe7
5 changed files with 75 additions and 6 deletions

View file

@ -1417,7 +1417,8 @@ extern void lex_free(void);
extern void lex_start(THD *thd);
extern void lex_end(LEX *lex);
extern int MYSQLlex(void *arg, void *yythd);
extern const char *skip_rear_comments(const char *ubegin, const char *uend);
extern const char *skip_rear_comments(CHARSET_INFO *cs, const char *ubegin,
const char *uend);
extern bool is_lex_native_function(const LEX_STRING *name);