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 | 23d8586dbfdfdf02fa2f801b9dad91db53025a64 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/sql_prepare.cc | |
| parent | d7dd2fc92f042596c2e72a96934bb207270e7419 (diff) | |
| download | mariadb-git-23d8586dbfdfdf02fa2f801b9dad91db53025a64.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_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 94a35db3a2d..89d450d9061 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -83,10 +83,23 @@ When one supplies long data for a placeholder: at statement execute. */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" +#include "sql_class.h" // set_var.h: THD #include "set_var.h" #include "sql_prepare.h" +#include "sql_parse.h" // insert_precheck, update_precheck, delete_precheck +#include "sql_base.h" // close_thread_tables +#include "sql_cache.h" // query_cache_* +#include "sql_view.h" // create_view_precheck +#include "sql_delete.h" // mysql_prepare_delete #include "sql_select.h" // for JOIN +#include "sql_insert.h" // upgrade_lock_type_for_insert, mysql_prepare_insert +#include "sql_update.h" // mysql_prepare_update +#include "sql_db.h" // mysql_opt_change_db, mysql_change_db +#include "sql_acl.h" // *_ACL +#include "sql_derived.h" // mysql_derived_prepare, + // mysql_handle_derived #include "sql_cursor.h" #include "sp_head.h" #include "sp.h" @@ -98,6 +111,7 @@ When one supplies long data for a placeholder: #else #include <mysql_com.h> #endif +#include "lock.h" // MYSQL_OPEN_FORCE_SHARED_MDL /** A result class used to send cursor rows using the binary protocol. |