Bug #24710065: SPLIT MY_GLOBAL.H

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

Change-Id: I05b71998630cfbb0a939031d0f6d6041357ff3ba

Author: Steinar H. Gunderson

client/mysql.cc

@@ -30,6 +30,7 @@
  *
  **/
 
+#include <fcntl.h>
 #include <m_ctype.h>
 #include <mf_wcomp.h>                  // wild_prefix, wild_one, wild_any
 #include <my_dir.h>

client/mysql_config_editor.cc

@@ -22,6 +22,7 @@
   MySQL Configuration Utility
 */
 
+#include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 

client/mysqladmin.cc

@@ -17,6 +17,7 @@
 
 /* maintaince of mysql databases */
 
+#include <fcntl.h>
 #include <my_thread.h>				/* because of signal()	*/
 #include <mysql.h>
 #include <mysqld_error.h>                       /* to check server error codes */

client/mysqlbinlog.cc

@@ -30,6 +30,7 @@
 
 #include "mysqlbinlog.h"
 
+#include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <algorithm>

client/mysqldump.cc

@@ -40,6 +40,7 @@
 
 #define DUMP_VERSION "10.13"
 
+#include <fcntl.h>
 #include <hash.h>
 #include <m_ctype.h>
 #include <m_string.h>

client/mysqlslap.cc

@@ -80,6 +80,7 @@
 #define SELECT_TYPE_REQUIRES_PREFIX 5
 #define DELETE_TYPE_REQUIRES_PREFIX 6
 
+#include <fcntl.h>
 #include <my_dir.h>
 #include <mysqld_error.h>
 #include <signal.h>

client/mysqltest.cc

@@ -26,6 +26,7 @@
 
 #define MTEST_VERSION "3.3"
 
+#include <fcntl.h>
 #include <hash.h>
 #include <m_ctype.h>
 #include <mf_wcomp.h>   // wild_compare

client/upgrade/program.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 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,6 +15,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include <fcntl.h>
 #include <stdlib.h>
 #include <algorithm>
 #include <functional>

extra/comp_client_err.cc

@@ -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
@@ -15,6 +15,7 @@
 
 
 #include <errmsg.h>
+#include <fcntl.h>
 #include <m_string.h>
 #include <my_getopt.h>
 #include <my_global.h>

extra/comp_err.cc

@@ -25,6 +25,7 @@
 */
 
 #include <assert.h>
+#include <fcntl.h>
 #include <m_ctype.h>
 #include <m_string.h>
 #include <my_dir.h>

extra/ibd2sdi.cc

@@ -16,6 +16,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 *****************************************************************************/
 
+#include <fcntl.h>
 #include <my_config.h>
 #include <my_global.h>
 #include <stdio.h>

extra/innochecksum.cc

@@ -25,6 +25,7 @@
   Published with a permission.
 */
 
+#include <fcntl.h>
 #include <my_config.h>
 #include <my_global.h>
 #include <stdio.h>
@@ -50,16 +51,16 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */
 #include "buf0checksum.h"
 #include "fil0types.h"
 #include "fsp0fsp.h"			/* fsp_flags_get_page_size() &
+
 					   fsp_flags_get_zip_size() */
 #include "fut0lst.h"			/* FLST_NODE_SIZE */
+#include "mach0data.h"			/* mach_read_from_4() */
 #include "os0file.h"
 #include "page0page.h"			/* PAGE_* */
 #include "page0size.h"			/* page_size_t */
 #include "page0zip.h"
 #include "trx0undo.h"			/* TRX_UNDO_* */
 #include "univ.i"			/* include all of this */
-
-#include "mach0data.h"			/* mach_read_from_4() */
 #include "ut0crc32.h"			/* ut_crc32_init() */
 
 /* Global variables */

extra/resolve_stack_dump.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 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,6 +18,7 @@
  */
 
 #include <errno.h>
+#include <fcntl.h>
 #include <m_ctype.h>
 #include <m_string.h>
 #include <my_config.h>

include/my_global.h

@@ -25,7 +25,6 @@
 
 #include <assert.h>
 #include <errno.h>				/* Recommended by debian */
-#include <fcntl.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>

libmysql/libmysql.cc

@@ -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 <fcntl.h>
 #include <m_ctype.h>
 #include <m_string.h>
 #include <my_global.h>

mysys/my_pread.cc

@@ -1,4 +1,4 @@
-/* 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
@@ -20,9 +20,11 @@
 #include "my_config.h"
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

mysys_ssl/my_default.cc

@@ -37,6 +37,7 @@
                                 the login file.
 */
 
+#include <fcntl.h>
 #include <my_aes.h>
 #include <my_dir.h>
 #include <my_getopt.h>

plugin/daemon_example/daemon_example.cc

@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include <ctype.h>
+#include <fcntl.h>
 #include <my_dir.h>
 #include <my_global.h>
 #include <mysql/plugin.h>

plugin/keyring/buffered_file_io.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/psi/mysql_file.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_session_detach.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_session_in_thd.cc

@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include <ctype.h>
+#include <fcntl.h>
 #include <my_dir.h>
 #include <my_global.h>
 #include <mysql/plugin.h>

plugin/test_service_sql_api/test_session_info.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_sql_2_sessions.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_all_col_types.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_cmds_1.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <mysql/service_srv_session_info.h>

plugin/test_service_sql_api/test_sql_commit.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_complex.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_errors.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_lock.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_sql_processlist.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_sql_replication.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_shutdown.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_sql_sqlmode.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_stmt.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_sql_views_triggers.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdio.h>

plugin/test_service_sql_api/test_x_sessions_deinit.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_service_sql_api/test_x_sessions_init.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <stdlib.h>

plugin/test_services/test_services.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <mysql_version.h>

plugin/test_services/test_services_threaded.cc

@@ -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 <fcntl.h>
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include <mysql_version.h>

rapid/plugin/x/ngs/ngs_common/operations_factory.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
@@ -18,12 +18,15 @@
  */
 
 #include "ngs_common/operations_factory.h"
+
+#include <fcntl.h>
+
 #include "ngs/memory.h"
 
 #ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#include <sys/types.h>
 #include <signal.h>
+#include <sys/types.h>
+#include <sys/un.h>
 #endif