Bug #24710065: SPLIT MY_GLOBAL.H

Run include-what-you-use limited to adding <sys/types.h> and then re-sorting
the #includes (and nothing else); then remove <sys/types.h> from my_global.h.

Change-Id: Iafb6783d4c6841029bfc02a5727fc2a911d88bfc

Author: Steinar H. Gunderson

client/base/debug_options.cc

@@ -15,12 +15,14 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "client/base/debug_options.h"
+
 #include <stdlib.h>
+#include <sys/types.h>
 #include <functional>
 
 #include "abstract_program.h"
 #include "client_priv.h"
-#include "debug_options.h"
 #include "my_dbug.h"
 
 using namespace Mysql::Tools::Base::Options;

client/base/mysql_query_runner.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,11 +15,13 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "client/base/mysql_query_runner.h"
+
 #include <stdlib.h>
+#include <sys/types.h>
 #include <functional>
 
 #include "m_ctype.h"
-#include "mysql_query_runner.h"
 #include "sql_string.h"
 #include "template_utils.h"
 

client/check/mysqlcheck.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,14 +18,15 @@
 #ifndef MYSQLCHECK_INCLUDED
 #define MYSQLCHECK_INCLUDED
 
+#include <sys/types.h>
 #include <string>
 #include <vector>
 
 namespace Mysql{
 namespace Tools{
 namespace Check{
 
-enum operations { DO_CHECK=1, DO_REPAIR, DO_ANALYZE, DO_OPTIMIZE, DO_UPGRADE };
+enum operations { DO_CHECK=1, DO_REPAIR, DO_ANALYZE, DO_OPTIMIZE, DO_UPGRADE };
 
 extern void mysql_check(MYSQL* connection, int what_to_do, my_bool opt_alldbs,
                 my_bool opt_check_only_changed, my_bool opt_extended,

client/check/mysqlcheck_core.cc

@@ -18,6 +18,7 @@
 #include <m_ctype.h>
 #include <mysql_version.h>
 #include <mysqld_error.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 

client/dump/abstract_mysql_chain_element_extension.h

@@ -18,6 +18,7 @@
 #ifndef ABSTRACT_MYSQL_CHAIN_ELEMENT_EXTENSION_INCLUDED
 #define ABSTRACT_MYSQL_CHAIN_ELEMENT_EXTENSION_INCLUDED
 
+#include <sys/types.h>
 #include <functional>
 
 #include "abstract_data_object.h"

client/dump/compression_zlib_writer.h

@@ -19,6 +19,7 @@
 #define COMPRESSION_ZLIB_WRITER_INCLUDED
 
 #include <string.h>
+#include <sys/types.h>
 #include <functional>
 
 #include "abstract_output_writer_wrapper.h"

client/dump/mysql_field.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,9 +18,11 @@
 #ifndef MYSQL_FIELD_INCLUDED
 #define MYSQL_FIELD_INCLUDED
 
+#include <sys/types.h>
+#include <string>
+
 #include "my_global.h"
 #include "mysql.h"
-#include <string>
 
 namespace Mysql{
 namespace Tools{

client/dump/mysql_object_reader.cc

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,10 +15,11 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#include <functional>
+#include "client/dump/mysql_object_reader.h"
 
-#include "mysql_object_reader.h"
 #include <boost/algorithm/string.hpp>
+#include <sys/types.h>
+#include <functional>
 
 using namespace Mysql::Tools::Dump;
 using std::placeholders::_1;

client/dump/object_queue.h

@@ -18,6 +18,7 @@
 #ifndef OBJECT_QUEUE_INCLUDED
 #define OBJECT_QUEUE_INCLUDED
 
+#include <sys/types.h>
 #include <functional>
 #include <map>
 #include <queue>

client/dump/sql_formatter.cc

@@ -15,16 +15,18 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "client/dump/sql_formatter.h"
+
 #include "my_config.h"
 
 #include <boost/algorithm/string.hpp>
+#include <sys/types.h>
 #include <chrono>
 #include <functional>
 #include <sstream>
 
 #include "mysql_function.h"
 #include "privilege.h"
-#include "sql_formatter.h"
 #include "stored_procedure.h"
 #include "view.h"
 

client/mysql.cc

@@ -40,6 +40,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <violite.h>
 
 #include "client_priv.h"

client/mysql_config_editor.cc

@@ -22,15 +22,17 @@
   MySQL Configuration Utility
 */
 
+#include "my_config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #include "client_priv.h"
 #include "my_aes.h"
 #include "my_compiler.h"
-#include "my_config.h"
 #include "my_dbug.h"
 #include "my_default.h"
 #include "my_default_priv.h"

client/mysql_secure_installation.cc

@@ -16,6 +16,7 @@
 */
 
 #include <stdlib.h>
+#include <sys/types.h>
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
 #include "client_priv.h"

client/mysqladmin.cc

@@ -25,6 +25,7 @@
 #include <sql_common.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <welcome_copyright_notice.h>           /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 #include <string>
 

client/mysqlbinlog.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 #define MYSQLBINLOG_INCLUDED
 
 #include <stdarg.h>
+#include <sys/types.h>
 
 #include "my_compiler.h"
 #include "my_inttypes.h"

client/mysqldump.cc

@@ -53,6 +53,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 #include "client_priv.h"

client/mysqlimport.cc

@@ -21,6 +21,7 @@
 */
 
 #include <stdlib.h>
+#include <sys/types.h>
 #include <welcome_copyright_notice.h>   /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 #include "client_priv.h"

client/mysqlshow.cc

@@ -25,6 +25,7 @@
 #include <sslopt-vars.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <welcome_copyright_notice.h>   /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 #include "client_priv.h"

client/mysqltest.cc

@@ -40,6 +40,7 @@
 #include <sql_common.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <violite.h>
 #include <cmath> // std::isinf
 

client/readline.cc

@@ -22,6 +22,7 @@
 #include <my_global.h>
 #include <my_sys.h>
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "my_dbug.h"
 #include "my_inttypes.h"

client/upgrade/program.cc

@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <algorithm>
 #include <functional>
 #include <iostream>

dbug/dbug.c

@@ -87,6 +87,7 @@
 #include <my_global.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #include "my_compiler.h"
 #include "my_dbug.h"

include/ft_global.h

@@ -1,7 +1,7 @@
 #ifndef FT_GLOBAL_INCLUDED
 #define FT_GLOBAL_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,9 +25,11 @@
 
 /* #include "myisam.h" */
 
+#include <sys/types.h>
+
+#include "m_ctype.h"
 #include "my_base.h"
 #include "my_inttypes.h"
-#include "m_ctype.h"
 
 #ifdef  __cplusplus
 extern "C" {

include/my_global.h

@@ -28,7 +28,6 @@
 #include <limits.h>
 #include <math.h>
 #include <stdarg.h>
-#include <sys/types.h>
 #include <time.h>
 
 #endif  // MY_GLOBAL_INCLUDED

include/my_sys.h

@@ -44,6 +44,7 @@
 #endif
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include "mysql/psi/mysql_cond.h"       /* mysql_cond_t */
 #include "mysql/psi/mysql_mutex.h"      /* mysql_mutex_t */

include/myisam.h

@@ -24,6 +24,8 @@
 
 #include "my_config.h"
 
+#include <sys/types.h>
+
 #include "keycache.h"
 #include "m_ctype.h"
 #include "m_string.h"

include/pfs_cond_provider.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
   Performance schema instrumentation (declarations).
 */
 
+#include <sys/types.h>
+
 #include "my_psi_config.h"
 
 #ifdef HAVE_PSI_COND_INTERFACE

include/pfs_error_provider.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
   Performance schema instrumentation (declarations).
 */
 
+#include <sys/types.h>
+
 #include "my_psi_config.h"
 
 #ifdef HAVE_PSI_ERROR_INTERFACE

include/pfs_file_provider.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
   Performance schema instrumentation (declarations).
 */
 
+#include <sys/types.h>
+
 #include "my_psi_config.h"
 
 #ifdef HAVE_PSI_FILE_INTERFACE
@@ -29,9 +31,9 @@
 
 #include <stddef.h>
 
+#include "my_inttypes.h"
 #include "my_io.h"
 #include "my_macros.h"
-#include "my_inttypes.h"
 #include "mysql/psi/psi_file.h"
 
 #define PSI_FILE_CALL(M) pfs_ ## M ## _v1

include/pfs_mutex_provider.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
   Performance schema instrumentation (declarations).
 */
 
+#include <sys/types.h>
+
 #include "my_psi_config.h"
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE