diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-11-08 17:37:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 16:09:34 +0100 |
| commit | 227510e039b4ec6bff3096a4b9b39847551dab1a (patch) | |
| tree | 2c40cbba45ca53e688d3f5cd388dbcd032c82984 /storage | |
| parent | d1522af72dad1965b8a8a37415545014ba743f49 (diff) | |
| download | mariadb-git-227510e039b4ec6bff3096a4b9b39847551dab1a.tar.gz | |
parser cleanup: don't store field properties in LEX, use Create_field directly
length/dec/charset are still in LEX, because they're also used
for CAST and dynamic columns.
also
1. fix "MDEV-7041 COLLATION(CAST('a' AS CHAR BINARY)) returns a wrong result"
2. allow BINARY modifier in stored function RETURN clause
3. allow "COLLATION without CHARSET" in SP/SF (parameters, RETURN, DECLARE)
4. print correct variable name in error messages for stored routine parameters
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/pfs_digest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc index bafc22e4b75..1fbf72c19c8 100644 --- a/storage/perfschema/pfs_digest.cc +++ b/storage/perfschema/pfs_digest.cc @@ -22,6 +22,8 @@ This code needs extra visibility in the lexer structures */ +#define MYSQL_LEX 1 + #include "my_global.h" #include "my_sys.h" #include "pfs_instr.h" @@ -35,7 +37,6 @@ #include <string.h> /* Generated code */ -#include "../sql/sql_yacc.h" #include "../storage/perfschema/pfs_lex_token.h" /* Name pollution from sql/sql_lex.h */ |