database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-11-19 17:23:39 +01:00
parent df7b27f1fe 496fda66fd
commit 3495801e2e
90 changed files with 2762 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_lex.h
View File

@ -104,6 +104,15 @@ struct sys_var_with_base
LEX_STRING base_name;
};
struct LEX_TYPE
{
enum enum_field_types type;
char *length, *dec;
CHARSET_INFO *charset;
void set(int t, char *l, char *d, CHARSET_INFO *cs)
{ type= (enum_field_types)t; length= l; dec= d; charset= cs; }
};
#ifdef MYSQL_SERVER
/*
The following hack is needed because mysql_yacc.cc does not define