diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-05-29 14:52:17 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-05-29 14:52:17 -0600 |
| commit | 5817bdffe73f70c46cc848c76a8721e16fdf31f7 (patch) | |
| tree | b09fee48f0ce9d6d8c7fc524be731472506e4435 /sql/sql_lex.h | |
| parent | 1b7acc5134853d54cd5170b7fe984bb987e31d03 (diff) | |
| download | mariadb-git-5817bdffe73f70c46cc848c76a8721e16fdf31f7.tar.gz | |
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
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 400535babf0..68a3092cd77 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -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); |