Skip to content

Commit f7cfe99

Browse files
author
Steinar H. Gunderson
committed
Bug #24710065: SPLIT MY_GLOBAL.H
Finally remove the last remnants of my_global.h. Change-Id: I9116b7d2c0a0ee090e5583951735a6cdbd6c6f13
1 parent ebcb981 commit f7cfe99

File tree

1,111 files changed

+980
-1760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,111 files changed

+980
-1760
lines changed

‎client/base/atomic.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
1818
#ifndef ATOMIC_INCLUDED
1919
#define ATOMIC_INCLUDED
2020

21-
#include "my_global.h"
2221
#include "my_atomic.h"
2322

2423
namespace my_boost{

‎client/base/composite_options_provider.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
*/
1717

18+
#include "client/base/composite_options_provider.h"
19+
20+
#include <stdarg.h>
1821
#include <stddef.h>
1922
#include <vector>
2023

21-
#include "composite_options_provider.h"
2224
#include "i_options_provider.h"
2325
#include "my_dbug.h"
2426

‎client/base/message_data.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
2121
#include <iostream>
2222
#include <string>
2323

24-
#include "my_global.h"
2524
#include "my_inttypes.h"
2625

2726
namespace Mysql{

‎client/base/mutex.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
1919
#define MUTEX_INCLUDED
2020

2121

22-
#include "my_global.h"
2322
#include "my_thread.h"
2423
#include "thr_mutex.h"
2524

‎client/base/mysql_query_runner.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "atomic.h"
2727
#include "message_data.h"
2828
#include "mutex.h"
29-
#include "my_global.h"
3029
#include "my_inttypes.h"
3130
#include "mysql.h"
3231

‎client/client_priv.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020

2121
/* Common defines for all clients */
2222

23-
#include <my_global.h>
24-
#include <my_sys.h>
25-
#include <m_string.h>
26-
#include <mysql.h>
2723
#include <errmsg.h>
24+
#include <m_string.h>
2825
#include <my_getopt.h>
26+
#include <my_sys.h>
27+
#include <mysql.h>
2928

3029
#ifndef WEXITSTATUS
3130
# ifdef _WIN32

‎client/completion_hash.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
* Small portability changes by Monty. Changed also to use my_malloc/my_free
2121
*/
2222

23+
#include "client/completion_hash.h"
24+
2325
#include <m_string.h>
24-
#include <my_global.h>
2526
#include <my_sys.h>
2627

27-
#include "completion_hash.h"
2828
#include "my_inttypes.h"
2929
#include "mysql/service_mysql_alloc.h"
3030

‎client/dump/abstract_data_object.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <string>
2222

2323
#include "i_data_object.h"
24-
#include "my_global.h"
2524
#include "my_inttypes.h"
2625

2726
namespace Mysql{

‎client/dump/chain_data.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#ifndef CHAIN_DATA_INCLUDED
1919
#define CHAIN_DATA_INCLUDED
2020

21-
#include "my_global.h"
2221
#include "my_inttypes.h"
2322

2423
namespace Mysql{

‎client/dump/event_scheduler_event.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <string>
2222

2323
#include "abstract_plain_sql_object_dump_task.h"
24-
#include "my_global.h"
2524
#include "my_inttypes.h"
2625

2726
namespace Mysql{

‎client/dump/i_chain_element.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define I_CHAIN_ELEMENT_INCLUDED
2020

2121
#include "i_progress_reporter.h"
22-
#include "my_global.h"
2322
#include "my_inttypes.h"
2423

2524
namespace Mysql{

‎client/dump/i_chain_maker.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -18,11 +18,10 @@
1818
#ifndef I_CHAIN_MAKER_INCLUDED
1919
#define I_CHAIN_MAKER_INCLUDED
2020

21+
#include "chain_data.h"
2122
#include "i_chain_element.h"
22-
#include "i_object_reader.h"
2323
#include "i_dump_task.h"
24-
#include "chain_data.h"
25-
#include "my_global.h"
24+
#include "i_object_reader.h"
2625

2726
namespace Mysql{
2827
namespace Tools{

‎client/dump/mysql_field.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <sys/types.h>
2222
#include <string>
2323

24-
#include "my_global.h"
2524
#include "mysql.h"
2625

2726
namespace Mysql{

‎client/dump/privilege.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <string>
2222

2323
#include "abstract_plain_sql_object_dump_task.h"
24-
#include "my_global.h"
2524
#include "my_inttypes.h"
2625

2726
namespace Mysql{

‎client/dump/simple_id_generator.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define SIMPLE_ID_GENERATOR_INCLUDED
2020

2121
#include "base/atomic.h"
22-
#include "my_global.h"
2322
#include "my_inttypes.h"
2423

2524
namespace Mysql{

‎client/dump/sql_formatter.cc

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <boost/algorithm/string.hpp>
2323
#include <sys/types.h>
24+
#include <time.h>
2425
#include <chrono>
2526
#include <functional>
2627
#include <sstream>

‎client/dump/sql_formatter_options.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#ifndef SQL_FORMATTER_OPTIONS_INCLUDED
1919
#define SQL_FORMATTER_OPTIONS_INCLUDED
2020

21-
#include <my_global.h>
2221
#include <stddef.h>
2322

2423
#include "base/abstract_options_provider.h"

‎client/dump/table.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include "abstract_plain_sql_object.h"
2525
#include "field.h"
26-
#include "my_global.h"
2726
#include "my_inttypes.h"
2827

2928
namespace Mysql{

‎client/dump/this_thread.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -18,9 +18,8 @@
1818
#ifndef THIS_THREAD_INCLUDED
1919
#define THIS_THREAD_INCLUDED
2020

21-
#include "my_global.h"
22-
#include "my_thread.h"
2321
#include "my_sys.h"
22+
#include "my_thread.h"
2423

2524
namespace my_boost{
2625

‎client/dump/thread.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
2020

2121
#include <exception>
2222

23-
#include "my_global.h"
2423
#include "my_thread.h"
2524

2625
namespace my_boost{

‎client/dump/thread_specific_ptr.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
1818
#ifndef THREAD_SPECIFIC_PTR_INCLUDED
1919
#define THREAD_SPECIFIC_PTR_INCLUDED
2020

21-
#include "my_global.h"
2221
#include "my_thread.h"
2322
#include "my_thread_local.h"
2423

‎client/get_password.c

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <m_ctype.h>
2424
#include <m_string.h>
25-
#include <my_global.h>
2625
#include <my_sys.h>
2726
#include <mysql/get_password.h>
2827

‎client/logger.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -15,7 +15,9 @@
1515
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
*/
1717

18-
#include "logger.h"
18+
#include "client/logger.h"
19+
20+
#include <time.h>
1921
#include <iostream>
2022
#include <locale>
2123

‎client/mysql.cc

+2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@
3535
#include <errno.h>
3636
#include <fcntl.h>
3737
#include <m_ctype.h>
38+
#include <math.h>
3839
#include <mf_wcomp.h> // wild_prefix, wild_one, wild_any
3940
#include <my_dir.h>
4041
#include <signal.h>
4142
#include <stdarg.h>
4243
#include <stdlib.h>
4344
#include <sys/types.h>
45+
#include <time.h>
4446
#include <violite.h>
4547

4648
#include "client_priv.h"

‎client/mysql_config_editor.cc

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <errno.h>
2828
#include <fcntl.h>
2929
#include <signal.h>
30+
#include <stdarg.h>
3031
#include <stdlib.h>
3132
#include <sys/types.h>
3233

‎client/mysql_ssl_rsa_setup.cc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <my_default.h>
2020
#include <my_dir.h>
2121
#include <my_getopt.h>
22-
#include <my_global.h>
2322
#include <my_sys.h>
2423
#include <mysql_version.h>
2524
#include <stdint.h>

‎client/mysqladmin.cc

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <stdlib.h>
2727
#include <sys/stat.h>
2828
#include <sys/types.h>
29+
#include <time.h>
2930
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
3031
#include <string>
3132

‎client/mysqlbinlog.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@
2828
Format_desc_of_slave, Rotate_of_master, Format_desc_of_master.
2929
*/
3030

31-
#include "mysqlbinlog.h"
31+
#include "client/mysqlbinlog.h"
3232

3333
#include <fcntl.h>
3434
#include <signal.h>
35+
#include <stdarg.h>
3536
#include <stdlib.h>
37+
#include <time.h>
3638
#include <algorithm>
3739
#include <map>
3840
#include <utility>

‎client/mysqldump.cc

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include <hash.h>
4848
#include <m_ctype.h>
4949
#include <m_string.h>
50-
#include <my_global.h>
5150
#include <my_sys.h>
5251
#include <my_user.h>
5352
#include <stdarg.h>

‎client/mysqlimport.cc

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include <stdlib.h>
2424
#include <sys/types.h>
25+
#include <time.h>
2526
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
2627

2728
#include "client_priv.h"

‎client/mysqlslap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080

8181
#include "my_config.h"
8282

83+
#include <ctype.h>
8384
#include <fcntl.h>
8485
#include <my_dir.h>
8586
#include <mysqld_error.h>
@@ -94,7 +95,7 @@
9495
#ifdef HAVE_SYS_TIME_H
9596
#include <sys/time.h>
9697
#endif
97-
#include <ctype.h>
98+
#include <time.h>
9899
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
99100

100101
#include "client_priv.h"

‎client/mysqltest.cc

+2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@
2929
#ifdef MY_MSCRT_DEBUG
3030
#include <crtdbg.h>
3131
#endif
32+
#include <assert.h>
3233
#include <errno.h>
3334
#include <fcntl.h>
3435
#include <hash.h>
36+
#include <limits.h>
3537
#include <m_ctype.h>
3638
#include <mf_wcomp.h> // wild_compare
3739
#include <my_dir.h>

‎client/path.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
along with this program; if not, write to the Free Software
1515
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
*/
17-
#include "path.h"
17+
#include "client/path.h"
1818

1919
#include <stddef.h>
2020
#ifdef HAVE_UNISTD_H
2121
#include <unistd.h>
2222
#endif
2323
#include "my_dir.h"
24-
#include "my_global.h"
2524
#include "my_inttypes.h"
2625
#include "my_io.h"
2726
#include "my_sys.h"

‎client/readline.cc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <m_string.h>
2121
#include <my_dir.h>
22-
#include <my_global.h>
2322
#include <my_sys.h>
2423
#include <stdio.h>
2524
#include <sys/types.h>

0 commit comments

Comments
 (0)