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"