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

plugin/auth_gssapi/client_plugin.cc

@@ -31,13 +31,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
   GSSAPI authentication plugin, client side
 */
-#include <string.h>
-#include <stdarg.h>
+#include <my_global.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 <stdlib.h>
-#include <stdio.h>
+#include <my_global.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 <stdlib.h>
+#include <my_global.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 <sys/types.h>
+#include <my_global.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 <sys/types.h>
+#include <my_global.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>