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

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
This commit is contained in:
Mats Kindahl
2010-03-31 16:05:33 +02:00
parent d7dd2fc92f
commit 23d8586dbf
325 changed files with 13308 additions and 3166 deletions

View File

@ -20,6 +20,11 @@
#ifndef SQL_LEX_INCLUDED
#define SQL_LEX_INCLUDED
#include "violite.h" /* SSL_type */
#include "sql_trigger.h"
#include "item.h" /* From item_subselect.h: subselect_union_engine */
#include "thr_lock.h" /* thr_lock_type, TL_UNLOCK */
/* YACC and LEX Definitions */
/* These may not be declared yet */
@ -35,6 +40,12 @@ class partition_info;
class Event_parse_data;
class set_var_base;
class sys_var;
class Item_func_match;
class Alter_drop;
class Alter_column;
class Key;
class File_parser;
class Key_part_spec;
/**
used by the parser to store internal variable name
@ -55,6 +66,7 @@ struct sys_var_with_base
#else
#include "lex_symbol.h"
#if MYSQL_LEX
#include "item_func.h" /* Cast_target used in sql_yacc.h */
#include "sql_yacc.h"
#define LEX_YYSTYPE YYSTYPE *
#else
@ -192,6 +204,12 @@ enum enum_drop_mode
DROP_RESTRICT // RESTRICT option
};
/* Options to add_table_to_list() */
#define TL_OPTION_UPDATING 1
#define TL_OPTION_FORCE_INDEX 2
#define TL_OPTION_IGNORE_LEAVES 4
#define TL_OPTION_ALIAS 8
typedef List<Item> List_item;
/* SERVERS CACHE CHANGES */
@ -2287,6 +2305,7 @@ extern bool is_lex_native_function(const LEX_STRING *name);
*/
void my_missing_function_error(const LEX_STRING &token, const char *name);
bool is_keyword(const char *name, uint len);
#endif /* MYSQL_SERVER */
#endif /* SQL_LEX_INCLUDED */