Enusure that my_global.h is included first

- Added sql/mariadb.h file that should be included first by files in sql
  directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
  that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h

include/hash.h

@@ -19,7 +19,6 @@
 #ifndef _hash_h
 #define _hash_h
 
-#include "my_global.h"                          /* uchar */
 #include "my_sys.h"                             /* DYNAMIC_ARRAY */
 
 /*

include/m_ctype.h

@@ -21,7 +21,6 @@
 #define _m_ctype_h
 
 #include <my_attribute.h>
-#include "my_global.h"                          /* uint16, uchar */
 
 enum loglevel {
    ERROR_LEVEL=       0,

include/m_string.h

@@ -22,7 +22,6 @@
 #ifndef _m_string_h
 #define _m_string_h
 
-#include "my_global.h"                          /* HAVE_* */
 #include "my_decimal_limits.h"
 
 #ifndef __USE_GNU

include/my_base.h

@@ -20,7 +20,6 @@
 #ifndef _my_base_h
 #define _my_base_h
 
-#include <my_global.h>
 #include <my_dir.h>			/* This includes types */
 #include <my_sys.h>
 #include <m_string.h>

include/my_bit.h

@@ -17,8 +17,6 @@
 #ifndef MY_BIT_INCLUDED
 #define MY_BIT_INCLUDED
 
-#include <my_global.h>
-
 /*
   Some useful bit functions
 */

include/my_compiler.h

@@ -24,8 +24,6 @@
   specific to a target compiler.
 */
 
-#include <my_global.h>                          /* stddef.h offsetof */
-
 /**
   Compiler-dependent internal convenience macros.
 */

include/my_dir.h

@@ -16,8 +16,6 @@
 #ifndef MY_DIR_H
 #define MY_DIR_H
 
-#include "my_global.h"
-
 #include <sys/stat.h>
 
 #ifdef	__cplusplus

include/my_net.h

@@ -22,8 +22,6 @@
 #ifndef _my_net_h
 #define _my_net_h
 
-#include "my_global.h"                  /* C_MODE_START, C_MODE_END */
-
 C_MODE_START
 
 #include <errno.h>

include/my_pthread.h

@@ -19,8 +19,6 @@
 #ifndef _my_pthread_h
 #define _my_pthread_h
 
-#include "my_global.h"                          /* myf */
-
 #ifndef ETIME
 #define ETIME ETIMEDOUT				/* For FreeBSD */
 #endif

include/my_stacktrace.h

@@ -17,8 +17,6 @@
 #ifndef _my_stacktrace_h_
 #define _my_stacktrace_h_
 
-#include <my_global.h>
-
 #ifdef TARGET_OS_LINUX
 #if defined (__x86_64__) || defined (__i386__) || \
     (defined(__alpha__) && defined(__GNUC__))

include/my_sys.h

@@ -17,8 +17,6 @@
 #ifndef _my_sys_h
 #define _my_sys_h
 
-#include "my_global.h"                  /* C_MODE_START, C_MODE_END */
-
 #include <m_string.h>
 
 C_MODE_START

include/my_time.h

@@ -22,7 +22,6 @@
 
 #ifndef _my_time_h_
 #define _my_time_h_
-#include "my_global.h"
 #include "mysql_time.h"
 #include "my_decimal_limits.h"
 

include/my_user.h

@@ -22,8 +22,6 @@
 #ifndef _my_user_h_
 #define _my_user_h_
 
-#include <my_global.h>
-
 C_MODE_START
 
 int parse_user(const char *user_id_str, size_t user_id_len,

include/mysql/psi/mysql_file.h

@@ -16,8 +16,6 @@
 #ifndef MYSQL_FILE_H
 #define MYSQL_FILE_H
 
-#include <my_global.h>
-
 /* For strlen() */
 #include <string.h>
 /* For MY_STAT */

include/password.h

@@ -16,8 +16,6 @@
 #ifndef PASSWORD_INCLUDED
 #define PASSWORD_INCLUDED
 
-#include "my_global.h"
-
 C_MODE_START
 
 void my_make_scrambled_password_323(char *to, const char *password,

include/queues.h

@@ -31,8 +31,6 @@
 #ifndef _queues_h
 #define _queues_h
 
-#include "my_global.h"                          /* uchar */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif

include/waiting_threads.h

@@ -16,7 +16,6 @@
 #ifndef _waiting_threads_h
 #define _waiting_threads_h
 
-#include <my_global.h>
 #include <my_sys.h>
 
 #include <lf.h>

include/wqueue.h

@@ -18,7 +18,6 @@
 #ifndef WQUEUE_INCLUDED
 #define WQUEUE_INCLUDED
 
-#include <my_global.h>
 #include <my_pthread.h>
 
 /* info about requests in a waiting queue */

libmysqld/emb_qcache.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "my_global.h"                          // HAVE_*
+#include "mariadb.h"
 #include "sql_priv.h"
 
 #ifdef HAVE_QUERY_CACHE

mysys/my_basename.c

@@ -13,6 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <my_global.h>
 #include <my_sys.h>
 /**
    @brief retrieve last component of the filename.

mysys/waiting_threads.c

@@ -172,6 +172,7 @@
       !! thread4 should not wait for thread2.
 */
 
+#include <my_global.h>
 #include <waiting_threads.h>
 #include <m_string.h>
 

mysys/wqueue.c

@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
+#include <my_global.h>
 #include <wqueue.h>
 
 #define STRUCT_PTR(TYPE, MEMBER, a)                                           \

plugin/auth_gssapi/client_plugin.cc

@@ -31,13 +31,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
   GSSAPI authentication plugin, client side
 */
-#include <string.h>
+#include <my_global.h>
-#include <stdarg.h>
 #include <mysqld_error.h>
 #include <mysql/client_plugin.h>
 #include <mysql.h>
-#include <stdio.h>
 #include "common.h"
+#include <string.h>
 
 extern int auth_client(char *principal_name,
                        char *mech,

plugin/auth_gssapi/gssapi_client.cc

@@ -26,9 +26,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <my_global.h>
 #include <gssapi/gssapi.h>
-#include <string.h>
-#include <stdio.h>
 #include <mysql/plugin_auth.h>
 #include <mysqld_error.h>
 #include <mysql.h>

plugin/auth_gssapi/gssapi_errmsg.cc

@@ -26,8 +26,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <my_global.h>
 #include <gssapi.h>
 #include <string.h>
+
 void gssapi_errmsg(OM_uint32 major, OM_uint32 minor, char *buf, size_t size)
 {
   OM_uint32 message_context;

plugin/auth_gssapi/gssapi_server.cc

@@ -1,6 +1,5 @@
-#include <my_config.h>
+#include <my_global.h>
 #include <gssapi/gssapi.h>
-#include <stdio.h>
 #include <mysql/plugin_auth.h>
 #include <my_sys.h>
 #include <mysqld_error.h>

plugin/auth_gssapi/server_plugin.cc

@@ -31,6 +31,7 @@
 
   GSSAPI authentication plugin, server side
 */
+#include <my_global.h>
 #include <my_sys.h>
 #include <mysqld_error.h>
 #include <mysql/plugin_auth.h>

plugin/auth_gssapi/sspi_client.cc

@@ -27,11 +27,10 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define SECURITY_WIN32
+#include <my_global.h>
 #include <windows.h>
 #include <sspi.h>
 #include <SecExt.h>
-#include <stdarg.h>
-#include <stdio.h>
 
 #include <mysql/plugin_auth.h>
 #include <mysql.h>
@@ -180,4 +179,4 @@ cleanup:
     FreeCredentialsHandle(&cred);
   free(out);
   return ret;
-}
+}

plugin/auth_gssapi/sspi_errmsg.cc

@@ -26,8 +26,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <my_global.h>
 #include <windows.h>
-#include <stdio.h>
+#include <string.h>
 
 #define ERRSYM(x) {x, #x}
 static struct {

plugin/auth_gssapi/sspi_server.cc

@@ -26,6 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <my_global.h>
 #include "sspi.h"
 #include "common.h"
 #include "server_plugin.h"

plugin/cracklib_password_check/cracklib_password_check.c

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_config.h>
+#include <my_global.h>
 #include <mysql/plugin_password_validation.h>
 #include <crack.h>
 #include <string.h>

plugin/feedback/feedback.h

@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #define MYSQL_SERVER 1
+#include <my_global.h>
 #include <sql_class.h>
 
 namespace feedback {

plugin/file_key_management/parser.cc

@@ -69,6 +69,7 @@ Example:
 openssl enc -aes-256-cbc -md sha1 -k "secret" -in keys.txt -out keys.enc
 ***********************************************************************/
 
+#include <my_global.h>
 #include "parser.h"
 #include <m_string.h>
 #include <mysys_err.h>

plugin/handler_socket/handlersocket/database.cpp

@@ -6,10 +6,7 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
-
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "database.hpp"

plugin/handler_socket/handlersocket/handlersocket.cpp

@@ -6,8 +6,7 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
-
 #include <memory>
 #include <string>
 #include <stdio.h>

plugin/handler_socket/handlersocket/hstcpsvr.cpp

@@ -6,15 +6,11 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
-
-#include <stdlib.h>
 #include <vector>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/resource.h>
 
 #include "hstcpsvr.hpp"

plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp

@@ -6,13 +6,11 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
-#include <sys/types.h>
 #include <netinet/in.h>
 #include <errno.h>
 #include <poll.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <stdexcept>
 #include <signal.h>
 #include <list>

plugin/handler_socket/handlersocket/mysql_incl.hpp

@@ -19,8 +19,7 @@
 
 #define MYSQL_SERVER 1
 
-#include <my_config.h>
+#include <my_global.h>
-
 #include <mysql_version.h>
 
 #if MYSQL_VERSION_ID >= 50505

plugin/handler_socket/libhsclient/auto_addrinfo.hpp

@@ -9,8 +9,7 @@
 #ifndef DENA_AUTO_ADDRINFO_HPP
 #define DENA_AUTO_ADDRINFO_HPP
 
-#include <my_config.h>
+#include <my_global.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <string.h>

plugin/handler_socket/libhsclient/hstcpcli.cpp

@@ -6,8 +6,7 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
-
 #include <stdexcept>
 
 #include "hstcpcli.hpp"

plugin/handler_socket/libhsclient/socket.cpp

@@ -6,13 +6,10 @@
  * See COPYRIGHT.txt for details.
  */
 
-#include <my_config.h>
+#include <my_global.h>
 
 #include <stdexcept>
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <sys/un.h>
 

plugin/locale_info/locale_info.cc

@@ -26,6 +26,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <my_global.h>
 #include <sql_class.h>          // THD
 #include <table.h>              // ST_SCHEMA_TABLE
 #include <mysql/plugin.h>

plugin/metadata_lock_info/metadata_lock_info.cc

@@ -14,7 +14,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #define MYSQL_SERVER 1
-#include "my_config.h"
+#include <my_global.h>
 #include "mysql_version.h"
 #include "mysql/plugin.h"
 #include "sql_class.h"

plugin/query_response_time/plugin.cc

@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #define MYSQL_SERVER
+#include <my_global.h>
 #include <sql_class.h>
 #include <table.h>
 #include <sql_show.h>

plugin/semisync/semisync.cc

@@ -16,6 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 
+#include <my_global.h>
 #include "semisync.h"
 
 const unsigned char ReplSemiSyncBase::kPacketMagicNum = 0xef;

plugin/semisync/semisync_master.cc

@@ -16,6 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 
+#include <my_global.h>
 #include "semisync_master.h"
 
 #define TIME_THOUSAND 1000

plugin/semisync/semisync_master_plugin.cc

@@ -16,6 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 
+#include <my_global.h>
 #include "semisync_master.h"
 #include "sql_class.h"                          // THD
 

plugin/semisync/semisync_slave.cc

@@ -15,6 +15,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 
+#include <my_global.h>
 #include "semisync_slave.h"
 
 char rpl_semi_sync_slave_enabled;

plugin/semisync/semisync_slave_plugin.cc

@@ -16,6 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 
+#include <my_global.h>
 #include "semisync_slave.h"
 #include <mysql.h>
 

plugin/server_audit/server_audit.c

@@ -20,10 +20,6 @@
 #define _my_thread_var loc_thread_var
 
 #include <my_config.h>
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <fcntl.h>
 
 #ifndef _WIN32
 #include <syslog.h>
@@ -75,6 +71,7 @@ static void closelog() {}
 */
 
 #if !defined(MYSQL_DYNAMIC_PLUGIN) && !defined(MARIADB_ONLY)
+#include <typelib.h>
 #define MARIADB_ONLY
 #endif /*MYSQL_PLUGIN_DYNAMIC*/
 
@@ -82,11 +79,12 @@ static void closelog() {}
 #define MYSQL_SERVICE_LOGGER_INCLUDED
 #endif /*MARIADB_ONLY*/
 
+#include <my_global.h>
 #include <my_base.h>
-//#include <my_dir.h>
 #include <typelib.h>
 #include <mysql/plugin.h>
 #include <mysql/plugin_audit.h>
+#include <string.h>
 #ifndef RTLD_DEFAULT
 #define RTLD_DEFAULT NULL
 #endif

plugin/server_audit/test_audit_v4.c

@@ -1,5 +1,6 @@
 #define PLUGIN_CONTEXT
 
+/* Can't use <my_global.h> as this includes plugin.h */
 #include <stdio.h>
 
 typedef void *MYSQL_THD;

plugin/simple_password_check/simple_password_check.c

@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <my_global.h>
 #include <my_sys.h>
 #include <mysqld_error.h>
 #include <mysql/plugin_password_validation.h>

plugin/user_variables/user_variables.cc

@@ -14,6 +14,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #define MYSQL_SERVER
+#include <my_global.h>
 #include <sql_class.h>
 #include <table.h>
 #include <sql_show.h>

plugin/userstat/userstat.cc

@@ -1,4 +1,4 @@
-#include <my_config.h>
+#include <my_global.h>
 #include <mysql/plugin.h>
 #include <mysql_version.h>
 #include "table.h"

plugin/wsrep_info/plugin.cc

@@ -17,7 +17,7 @@
 #define MYSQL_SERVER
 #endif
 
-#include <my_config.h>
+#include <my_global.h>
 #include <mysql/plugin.h>
 #include <table.h>                              /* ST_SCHEMA_TABLE */
 #include <sql_show.h>

sql-common/my_time.c

@@ -15,6 +15,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <my_global.h>
 #include <my_time.h>
 #include <m_string.h>
 #include <m_ctype.h>

sql-common/my_user.c

@@ -14,6 +14,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <my_global.h>
 #include <my_user.h>
 #include <m_string.h>
 #include <mysql_com.h>

sql/bounded_queue.h

@@ -16,9 +16,8 @@
 #ifndef BOUNDED_QUEUE_INCLUDED
 #define BOUNDED_QUEUE_INCLUDED
 
-#include "my_global.h"
 #include "my_base.h"
-#include "my_sys.h"
+#include <my_sys.h>
 #include "queues.h"
 #include <string.h>
 

sql/compat56.cc

@@ -15,7 +15,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "my_global.h"
+#include "mariadb.h"
 #include "compat56.h"
 #include "myisampack.h"
 #include "my_time.h"

sql/create_options.cc

@@ -19,6 +19,7 @@
   Engine defined options of tables/fields/keys in CREATE/ALTER TABLE.
 */
 
+#include "mariadb.h"
 #include "create_options.h"
 #include <my_getopt.h>
 #include "set_var.h"

sql/datadict.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "datadict.h"
 #include "sql_priv.h"
 #include "sql_class.h"

sql/debug_sync.cc

@@ -15,7 +15,7 @@
 
 /* see include/mysql/service_debug_sync.h for debug sync documentation */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "debug_sync.h"
 
 #if defined(ENABLED_DEBUG_SYNC)

sql/debug_sync.h

@@ -26,8 +26,6 @@
 #pragma interface                      /* gcc class implementation */
 #endif
 
-#include <my_global.h>
-
 class THD;
 
 #if defined(ENABLED_DEBUG_SYNC)

sql/derror.cc

@@ -21,7 +21,7 @@
   Read language depeneded messagefile
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "derror.h"

sql/derror.h

@@ -16,8 +16,6 @@
 #ifndef DERROR_INCLUDED
 #define DERROR_INCLUDED
 
-#include "my_global.h"                          /* uint */
-
 bool init_errmessage(void);
 void free_error_messages();
 bool read_texts(const char *file_name, const char *language,

sql/des_key_file.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>          // HAVE_*
+#include "mariadb.h"          // HAVE_*
 #include "sql_priv.h"
 #include "des_key_file.h"       // st_des_keyschedule, st_des_keyblock
 #include "log.h"                // sql_print_error

sql/discover.cc

@@ -21,7 +21,7 @@
   Functions for discover of frm file from handler
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "discover.h"

sql/discover.h

@@ -16,8 +16,6 @@
 #ifndef DISCOVER_INCLUDED
 #define DISCOVER_INCLUDED
 
-#include "my_global.h"                          /* uchar */
-
 int extension_based_table_discovery(MY_DIR *dirp, const char *ext,
                                     handlerton::discovered_list *tl);
 

sql/encryption.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include <mysql/plugin_encryption.h>
 #include "log.h"
 #include "sql_plugin.h"

sql/event_data_objects.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #define MYSQL_LEX 1
-#include <my_global.h>                          /* NO_EMBEDDED_ACCESS_CHECKS */
+#include "mariadb.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
 #include "unireg.h"
 #include "sql_parse.h"                          // parse_sql

sql/event_db_repository.cc

@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "sql_base.h"                           // close_thread_tables

sql/event_parse_data.cc

@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "sp_head.h"

sql/event_queue.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "event_queue.h"

sql/event_scheduler.cc

@@ -13,7 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "event_scheduler.h"

sql/events.cc

@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "sql_parse.h"                          // check_access

sql/field.cc

@@ -27,7 +27,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_select.h"
 #include "rpl_rli.h"                            // Pull in Relay_log_info

sql/field_conv.cc

@@ -25,7 +25,7 @@
     gives much more speed.
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_class.h"                          // THD
 #include <m_ctype.h>

sql/filesort.cc

@@ -22,7 +22,7 @@
   Sorts a database
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "filesort.h"
 #ifdef HAVE_STDDEF_H

sql/filesort_utils.cc

@@ -13,11 +13,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
+#include "mariadb.h"
 #include "filesort_utils.h"
 #include "sql_const.h"
 #include "sql_sort.h"
 #include "table.h"
-#include "my_sys.h"
 
 
 namespace {

sql/filesort_utils.h

@@ -16,7 +16,6 @@
 #ifndef FILESORT_UTILS_INCLUDED
 #define FILESORT_UTILS_INCLUDED
 
-#include "my_global.h"
 #include "my_base.h"
 #include "sql_array.h"
 

sql/gcalc_slicescan.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 
-#include <my_global.h>
+#include "mariadb.h"
 #include <my_sys.h>
 #include <m_string.h>
 

sql/gcalc_tools.cc

@@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 
-#include <my_global.h> 
+#include "mariadb.h"
 
 #ifdef HAVE_SPATIAL
 

sql/gen_lex_hash.cc

@@ -78,11 +78,9 @@ So, we can read full search-structure as 32-bit word
 */
 
 #define NO_YACC_SYMBOLS
-#include <my_global.h>
+#include "mariadb.h"
 #include "mysql_version.h"
 #include "lex.h"
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */

sql/gen_lex_token.cc

@@ -14,9 +14,7 @@
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#include <my_global.h>
+#include "mariadb.h"
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 /* We only need the tokens here */

sql/group_by_handler.cc

@@ -21,6 +21,7 @@
   upper level.
 */
 
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_select.h"
 

sql/gstream.cc

@@ -18,7 +18,7 @@
   NOTE: These functions assumes that the string is end \0 terminated!
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "gstream.h"
 #include "m_string.h"                           // LEX_STRING

sql/gstream.h

@@ -17,8 +17,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 
-#include "my_global.h"                          /* NULL, NullS */
+#include <my_sys.h>                             /* MY_ALLOW_ZERO_PTR */
-#include "my_sys.h"                             /* MY_ALLOW_ZERO_PTR */
 #include "m_ctype.h"           /* my_charset_latin1, my_charset_bin */
 
 class Gis_read_stream

sql/ha_partition.cc

@@ -46,7 +46,7 @@
   if this file.
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_parse.h"                          // append_file_to_dir
 #include "create_options.h"

sql/ha_sequence.cc

@@ -16,7 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_list.h"
 #include "table.h"
 #include "sql_sequence.h"

sql/handler.cc

@@ -20,7 +20,7 @@
   Handler-calling-functions
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"
 #include "rpl_handler.h"

sql/handler.h

@@ -25,7 +25,6 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-#include <my_global.h>                          /* For handlers */
 #include "sql_const.h"
 #include "sql_basic_types.h"
 #include "mysqld.h"                             /* server_id */

sql/hash_filo.cc

@@ -23,7 +23,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "hash_filo.h"
 

sql/hostname.cc

@@ -24,7 +24,7 @@
   Hostnames are checked with reverse name lookup and checked that they
   doesn't resemble an IP address.
 */
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "unireg.h"                             // SPECIAL_NO_HOST_CACHE
 #include "hostname.h"

sql/hostname.h

@@ -16,7 +16,6 @@
 #ifndef HOSTNAME_INCLUDED
 #define HOSTNAME_INCLUDED
 
-#include "my_global.h"                          /* uint */
 #include "my_net.h"
 #include "hash_filo.h"
 

sql/init.cc

@@ -21,10 +21,9 @@
   Init and dummy functions for interface with unireg
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include "init.h"
-#include "my_sys.h"
 #include "mysqld.h"                             // abort_loop, ...
 #include "my_time.h"                            // my_init_time
 #include "unireg.h"                             // SPECIAL_SAME_DB_NAME

sql/init.h

@@ -16,8 +16,6 @@
 #ifndef INIT_INCLUDED
 #define INIT_INCLUDED
 
-#include "my_global.h"                          /* ulong */
-
 void unireg_init(ulong options);
 void unireg_end(void) __attribute__((noreturn));
 

sql/item.cc

@@ -19,7 +19,7 @@
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
-#include <my_global.h>                          /* NO_EMBEDDED_ACCESS_CHECKS */
+#include "mariadb.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
 #include <mysql.h>
 #include <m_ctype.h>

sql/item_buff.cc

@@ -22,7 +22,7 @@
   Buffers to save and compare item values
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 /*
   It is necessary to include set_var.h instead of item.h because there

sql/item_cmpfunc.cc

@@ -26,7 +26,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 #include <m_ctype.h>
 #include "sql_select.h"

sql/item_create.cc

@@ -22,7 +22,7 @@
   Functions to create an item. Used by sql_yac.yy
 */
 
-#include <my_global.h>
+#include "mariadb.h"
 #include "sql_priv.h"
 /*
   It is necessary to include set_var.h instead of item.h because there