diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 2 | ||||
| -rw-r--r-- | client/completion_hash.cc | 2 | ||||
| -rw-r--r-- | client/errmsg.c | 2 | ||||
| -rw-r--r-- | client/get_password.c | 2 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqlshow.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.c | 2 | ||||
| -rw-r--r-- | client/password.c | 2 | ||||
| -rw-r--r-- | client/readline.cc | 2 | ||||
| -rw-r--r-- | client/sql_string.cc | 2 | ||||
| -rw-r--r-- | client/thimble.cc | 2 | ||||
| -rw-r--r-- | client/thread_test.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 7bee03a8ab5..64ded3ed7f3 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -16,7 +16,7 @@ /* Common defines for all clients */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <mysql.h> diff --git a/client/completion_hash.cc b/client/completion_hash.cc index 006427f0295..74ff3083197 100644 --- a/client/completion_hash.cc +++ b/client/completion_hash.cc @@ -22,7 +22,7 @@ * Small portability changes by Monty. Changed also to use my_malloc/my_free */ -#include <global.h> +#include <my_global.h> #include <m_string.h> #undef SAFEMALLOC // Speed things up #include <my_sys.h> diff --git a/client/errmsg.c b/client/errmsg.c index 9f67a15dcb2..012158a6e30 100644 --- a/client/errmsg.c +++ b/client/errmsg.c @@ -18,7 +18,7 @@ /* Error messages for MySQL clients */ /* error messages for the demon is in share/language/errmsg.sys */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include "errmsg.h" diff --git a/client/get_password.c b/client/get_password.c index 25069a14b75..e47cf7b3783 100644 --- a/client/get_password.c +++ b/client/get_password.c @@ -19,7 +19,7 @@ ** Ask for a password from tty ** This is an own file to avoid conflicts with curses */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include "mysql.h" #include <m_string.h> diff --git a/client/mysqldump.c b/client/mysqldump.c index 9d8e15a7942..9d80fd9a6c9 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -39,7 +39,7 @@ #define DUMP_VERSION "8.16" -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 199318abc2f..8bce1203df8 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -18,7 +18,7 @@ #define SHOW_VERSION "8.3" -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include "mysql.h" diff --git a/client/mysqltest.c b/client/mysqltest.c index f269dd373c6..a021478d737 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -45,7 +45,7 @@ #define MTEST_VERSION "1.10" -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <mysql.h> diff --git a/client/password.c b/client/password.c index 0fd5861873a..cb658f32022 100644 --- a/client/password.c +++ b/client/password.c @@ -35,7 +35,7 @@ This saves a hashed number as a string in the password field. *****************************************************************************/ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include "mysql.h" diff --git a/client/readline.cc b/client/readline.cc index f0312b089e5..f390be466ab 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -17,7 +17,7 @@ /* readline for batch mode */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include "my_readline.h" diff --git a/client/sql_string.cc b/client/sql_string.cc index 4b9ebef21f1..d749dbee978 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -21,7 +21,7 @@ #pragma implementation // gcc: Class implementation #endif -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> diff --git a/client/thimble.cc b/client/thimble.cc index 6d1e8a85559..4a4227b3c71 100644 --- a/client/thimble.cc +++ b/client/thimble.cc @@ -2,7 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include "my_global.h" +#include "my_my_global.h" static void spawn_stern_thread(pthread_t *t); static int act_goofy(void); diff --git a/client/thread_test.c b/client/thread_test.c index 41adb23c408..06c6424de66 100644 --- a/client/thread_test.c +++ b/client/thread_test.c @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <global.h> +#include <my_global.h> #ifndef THREAD |