From e409d6f69c91a9f097802455dd61a2387e16d5f0 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Wed, 31 Mar 2010 16:05:33 +0200 Subject: 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 --- sql/sql_union.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sql/sql_union.cc') diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ad14d2e4ecd..a4d3f61f0e3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -20,9 +20,13 @@ */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" +#include "sql_union.h" #include "sql_select.h" #include "sql_cursor.h" +#include "sql_base.h" // fill_record +#include "filesort.h" // filesort_free_buffers bool mysql_union(THD *thd, LEX *lex, select_result *result, SELECT_LEX_UNIT *unit, ulong setup_tables_done_option) -- cgit v1.2.1