diff options
Diffstat (limited to 'storage')
40 files changed, 41 insertions, 14 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 6c308e7eef1..c1acef4596f 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -21,7 +21,7 @@ #pragma implementation // gcc: Class implementation #endif -#include "sql_class.h" // SSV +#include "sql_class.h" // SSV and my_global.h #include "sql_table.h" // build_table_filename #include <myisam.h> // T_EXTEND diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index 91a2c70cb9f..56d8000d64d 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -19,6 +19,7 @@ #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include "unireg.h" #include "ha_blackhole.h" diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 9db78065bb3..92ac20a8f82 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -41,10 +41,9 @@ TODO: -Brian */ -#include "my_global.h" +#include <my_global.h> #include "sql_priv.h" #include "sql_class.h" // SSV -#include <mysql/plugin.h> #include <mysql/psi/mysql_file.h> #include "ha_tina.h" #include "probes_mysql.h" diff --git a/storage/csv/transparent_file.cc b/storage/csv/transparent_file.cc index a307f9885c0..1f1123aefc2 100644 --- a/storage/csv/transparent_file.cc +++ b/storage/csv/transparent_file.cc @@ -17,6 +17,7 @@ #pragma implementation // gcc: Class implementation #endif +#include <my_global.h> #include "sql_priv.h" #include <mysql/psi/mysql_file.h> #include "transparent_file.h" diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 4608aedd129..6d3d665b9f1 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -372,6 +372,7 @@ #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include "sql_servers.h" // FOREIGN_SERVER, get_server_by_name #include "sql_class.h" // SSV diff --git a/storage/federatedx/federatedx_io.cc b/storage/federatedx/federatedx_io.cc index 34d3dde3ebb..1e0348e3bf8 100644 --- a/storage/federatedx/federatedx_io.cc +++ b/storage/federatedx/federatedx_io.cc @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*#define MYSQL_SERVER 1*/ +#include <my_global.h> #include "sql_priv.h" -#include <mysql/plugin.h> #include "ha_federatedx.h" diff --git a/storage/federatedx/federatedx_io_mysql.cc b/storage/federatedx/federatedx_io_mysql.cc index 2933073a679..1ff6abc4c77 100644 --- a/storage/federatedx/federatedx_io_mysql.cc +++ b/storage/federatedx/federatedx_io_mysql.cc @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" -#include <mysql/plugin.h> #include "ha_federatedx.h" diff --git a/storage/federatedx/federatedx_io_null.cc b/storage/federatedx/federatedx_io_null.cc index 4322422ef37..aa35d4bdecc 100644 --- a/storage/federatedx/federatedx_io_null.cc +++ b/storage/federatedx/federatedx_io_null.cc @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*#define MYSQL_SERVER 1*/ +#include <my_global.h> #include "sql_priv.h" -#include <mysql/plugin.h> #include "ha_federatedx.h" diff --git a/storage/federatedx/federatedx_txn.cc b/storage/federatedx/federatedx_txn.cc index 5049b1ff79f..232ac335dfc 100644 --- a/storage/federatedx/federatedx_txn.cc +++ b/storage/federatedx/federatedx_txn.cc @@ -31,8 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" -#include <mysql/plugin.h> #include "ha_federatedx.h" diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 5631d60a10a..3ad5c6e9e0a 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -20,6 +20,7 @@ #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include "sql_plugin.h" #include "ha_heap.h" diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index cb5faa42199..fe36829ba44 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -21,6 +21,7 @@ this program; if not, write to the Free Software Foundation, Inc., Smart ALTER TABLE *******************************************************/ +#include <my_global.h> #include <unireg.h> #include <mysqld_error.h> #include <log.h> diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 7155faa72f4..e80ce15165b 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -21,7 +21,7 @@ #endif #define MYSQL_SERVER 1 -#include <mysql/plugin.h> +#include <my_global.h> #include <m_ctype.h> #include <my_dir.h> #include <myisampack.h> diff --git a/storage/maria/unittest/ma_maria_log_cleanup.c b/storage/maria/unittest/ma_maria_log_cleanup.c index 3e4bc755832..6ecec9bbc19 100644 --- a/storage/maria/unittest/ma_maria_log_cleanup.c +++ b/storage/maria/unittest/ma_maria_log_cleanup.c @@ -14,7 +14,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../maria_def.h" -#include <my_dir.h> #ifdef _WIN32 #include <direct.h> /* rmdir */ #endif diff --git a/storage/maria/unittest/test_file.c b/storage/maria/unittest/test_file.c index 567f4ef8b94..1a14f2e8ec5 100644 --- a/storage/maria/unittest/test_file.c +++ b/storage/maria/unittest/test_file.c @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <tap.h> +#include <tap.h> /* Includes my_global.h */ #include <my_sys.h> #include <my_dir.h> #include "test_file.h" diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index f90e01d8cc9..f21845bae63 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -21,9 +21,9 @@ #endif #define MYSQL_SERVER 1 +#include "sql_plugin.h" #include "sql_priv.h" #include "key.h" // key_copy -#include "sql_plugin.h" #include <m_ctype.h> #include <my_bit.h> #include "ha_myisam.h" diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 191ccd5ed89..93722162d86 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -90,12 +90,12 @@ #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include "unireg.h" #include "sql_cache.h" // query_cache_* #include "sql_show.h" // append_identifier #include "sql_table.h" // build_table_filename -#include <mysql/plugin.h> #include <m_ctype.h> #include "../myisam/ha_myisam.h" #include "ha_myisammrg.h" diff --git a/storage/oqgraph/oqgraph_thunk.cc b/storage/oqgraph/oqgraph_thunk.cc index e929ca3f5b0..0e7b1f2b8ed 100644 --- a/storage/oqgraph/oqgraph_thunk.cc +++ b/storage/oqgraph/oqgraph_thunk.cc @@ -22,17 +22,18 @@ ====================================================================== */ +#include <my_config.h> #include "oqgraph_thunk.h" #include <boost/tuple/tuple.hpp> #define MYSQL_SERVER -#include "mysql_version.h" +#include <my_global.h> +#include "unireg.h" #include "sql_base.h" #include "table.h" #include "field.h" #include "key.h" -#include "unireg.h" #if MYSQL_VERSION_ID < 100000 // Allow compatibility with build for 5.5.32 diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 03fa6440d43..2944e750b88 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -18,6 +18,7 @@ #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/hs_client/config.cpp b/storage/spider/hs_client/config.cpp index 8f6447829e1..b546230ca03 100644 --- a/storage/spider/hs_client/config.cpp +++ b/storage/spider/hs_client/config.cpp @@ -7,6 +7,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/hs_client/escape.cpp b/storage/spider/hs_client/escape.cpp index d382dfbc07e..c3194e1d111 100644 --- a/storage/spider/hs_client/escape.cpp +++ b/storage/spider/hs_client/escape.cpp @@ -6,6 +6,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #include "mysql_version.h" #include "hs_compat.h" #include "escape.hpp" diff --git a/storage/spider/hs_client/fatal.cpp b/storage/spider/hs_client/fatal.cpp index b26fb50f4fb..bec031153e4 100644 --- a/storage/spider/hs_client/fatal.cpp +++ b/storage/spider/hs_client/fatal.cpp @@ -7,6 +7,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/hs_client/hstcpcli.cpp b/storage/spider/hs_client/hstcpcli.cpp index 6aa83e60a27..fed87803f9c 100644 --- a/storage/spider/hs_client/hstcpcli.cpp +++ b/storage/spider/hs_client/hstcpcli.cpp @@ -7,6 +7,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #include "mysql_version.h" #include "hs_compat.h" #if MYSQL_VERSION_ID < 50500 diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp index 769bd0b497c..2082d1f024e 100644 --- a/storage/spider/hs_client/socket.cpp +++ b/storage/spider/hs_client/socket.cpp @@ -7,6 +7,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #ifndef __WIN__ #include <sys/types.h> #include <sys/un.h> diff --git a/storage/spider/hs_client/string_util.cpp b/storage/spider/hs_client/string_util.cpp index 133143165c2..9cf2f04d5b6 100644 --- a/storage/spider/hs_client/string_util.cpp +++ b/storage/spider/hs_client/string_util.cpp @@ -7,6 +7,7 @@ * See COPYRIGHT.txt for details. */ +#include <my_global.h> #include "mysql_version.h" #include "hs_compat.h" #if MYSQL_VERSION_ID < 50500 diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index e19222c99f6..ce786a7b697 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_copy_tables.cc b/storage/spider/spd_copy_tables.cc index 10fed696134..dae0d94d7aa 100644 --- a/storage/spider/spd_copy_tables.cc +++ b/storage/spider/spd_copy_tables.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 64e2dc59b65..81b6fae841f 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc index f7f974a0142..d1eb68679b2 100644 --- a/storage/spider/spd_db_handlersocket.cc +++ b/storage/spider/spd_db_handlersocket.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 81e2fc41a57..f60220ee38b 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc index 0d8a218c5f6..0464d2b576d 100644 --- a/storage/spider/spd_db_oracle.cc +++ b/storage/spider/spd_db_oracle.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc index 27041790d63..7149502d8f6 100644 --- a/storage/spider/spd_direct_sql.cc +++ b/storage/spider/spd_direct_sql.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_i_s.cc b/storage/spider/spd_i_s.cc index 49824693984..025878b6253 100644 --- a/storage/spider/spd_i_s.cc +++ b/storage/spider/spd_i_s.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_malloc.cc b/storage/spider/spd_malloc.cc index 4a033c1e7cf..56fb3c9ccd2 100644 --- a/storage/spider/spd_malloc.cc +++ b/storage/spider/spd_malloc.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc index 2b1e87313d1..387d17134e5 100644 --- a/storage/spider/spd_param.cc +++ b/storage/spider/spd_param.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc index d32dbec2421..8c55b0fc683 100644 --- a/storage/spider/spd_ping_table.cc +++ b/storage/spider/spd_ping_table.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc index 1ff3496d83e..7b46889a135 100644 --- a/storage/spider/spd_sys_table.cc +++ b/storage/spider/spd_sys_table.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 388f32afb7c..b00eb4710a8 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index a66fa5a7f5d..dd0cc1d3101 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index f98b8671862..a561ae22f86 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -21,6 +21,7 @@ this program; if not, write to the Free Software Foundation, Inc., Smart ALTER TABLE *******************************************************/ +#include <my_global.h> #include <unireg.h> #include <mysqld_error.h> #include <log.h> diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc index 69a75f5a4fe..d7ab6628757 100644 --- a/storage/xtradb/handler/i_s.cc +++ b/storage/xtradb/handler/i_s.cc @@ -22,6 +22,7 @@ InnoDB INFORMATION SCHEMA tables interface to MySQL. Created July 18, 2007 Vasil Dimov *******************************************************/ +#include <my_global.h> #ifndef MYSQL_SERVER #define MYSQL_SERVER /* For Item_* classes */ #include <item.h> |