diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
| commit | e409d6f69c91a9f097802455dd61a2387e16d5f0 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/sql_yacc.yy | |
| parent | 36430c53f98931028ce318bed7f2834a4ff30195 (diff) | |
| download | mariadb-git-e409d6f69c91a9f097802455dd61a2387e16d5f0.tar.gz | |
WL#5030: Split and remove mysql_priv.h
This patch:
- Moves all definitions from the mysql_priv.h file into
header files for the component where the variable is
defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ea9605687d3..207e72404ef 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -35,7 +35,14 @@ #define YYMAXDEPTH 3200 /* Because of 64K stack */ #define Lex (YYTHD->lex) #define Select Lex->current_select -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" // REQUIRED: for other includes +#include "sql_parse.h" /* comp_*_creator */ +#include "sql_table.h" /* primary_key_name */ +#include "sql_partition.h" /* mem_alloc_error, partition_info, HASH_PARTITION */ +#include "sql_acl.h" /* *_ACL */ +#include "password.h" /* my_make_scrambled_password_323, my_make_scrambled_password */ +#include "sql_class.h" /* Key_part_spec, enum_filetype, Diag_condition_item_name */ #include "slave.h" #include "lex_symbol.h" #include "item_create.h" |