diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-05-27 16:05:29 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-05-27 16:05:29 +0300 |
| commit | 80730df7d634e1a620c864d6665d6e66ccad447a (patch) | |
| tree | 84a2cbd1035921bbaa22dbb65522b2d16b307602 /sql/sql_lex.h | |
| parent | f54beb2dccb921296a4c0bec1aa45e5dd6e53a69 (diff) | |
| download | mariadb-git-80730df7d634e1a620c864d6665d6e66ccad447a.tar.gz | |
Bug #38159: Function parsing problem generates misleading error message
Added a more detailed error message on calling an ambiguous missing function.
mysql-test/r/ps.result:
Bug #38159: fixed existing tests
mysql-test/r/sp-error.result:
Bug #38159: test case
mysql-test/t/ps.test:
Bug #38159: fixed existing tests
mysql-test/t/sp-error.test:
Bug #38159: test case
sql/item_func.cc:
Bug #38159: generate more detailed error message
sql/share/errmsg.txt:
Bug #38159: add a more detailed error message
sql/sql_derived.cc:
Bug #38159: treat the detailed error message the same way as the
generic one
sql/sql_lex.cc:
Bug #38159:
- detect if the token is ambiguous and print the appropriate error.
- backport is_lex_native_function() from 5.1
sql/sql_lex.h:
Bug #38159: detect if the token is ambiguous and print the appropriate error.
sql/sql_yacc.yy:
Bug #38159: generate more detailed error message
sql/table.cc:
Bug #38159: treat the detailed error message the same way as the
generic one
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 5c0367632e1..627003880d9 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1390,3 +1390,5 @@ extern void lex_end(LEX *lex); extern int MYSQLlex(void *arg, void *yythd); extern char *skip_rear_comments(CHARSET_INFO *cs, char *begin, char *end); +extern bool is_lex_native_function(const LEX_STRING *name); +int my_missing_function_error(const LEX_STRING &token, const char *name); |