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

WL#5030: Split and remove mysql_priv.h

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/debug_sync.cc
View File

@ -321,12 +321,13 @@
/*
Due to weaknesses in our include files, we need to include
mysql_priv.h here. To have THD declared, we need to include
sql_priv.h here. To have THD declared, we need to include
sql_class.h. This includes log_event.h, which in turn requires
declarations from mysql_priv.h (e.g. OPTION_AUTO_IS_NULL).
mysql_priv.h includes almost everything, so is sufficient here.
declarations from sql_priv.h (e.g. OPTION_AUTO_IS_NULL).
sql_priv.h includes almost everything, so is sufficient here.
*/
#include "mysql_priv.h"
#include "sql_priv.h"
#include "sql_parse.h"
/*
Action to perform at a synchronization point.
@ -394,7 +395,7 @@ extern "C" void (*debug_sync_C_callback_ptr)(const char *, size_t);
We cannot place a sync point directly in C files (like those in mysys or
certain storage engines written mostly in C like MyISAM or Maria). Because
they are C code and do not include mysql_priv.h. So they do not know the
they are C code and do not include sql_priv.h. So they do not know the
macro DEBUG_SYNC(thd, sync_point_name). The macro needs a 'thd' argument.
Hence it cannot be used in files outside of the sql/ directory.