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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 3 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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{

0 commit comments

Comments
 (0)