diff options
23 files changed, 55 insertions, 43 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 9831ad3a891..426f0cc40b2 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -14,14 +14,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "command.h" #include "commands.h" -#include "instance.h" + #include "instance_map.h" #include "messages.h" +#include "mysqld_error.h" +#include "mysql_manager_error.h" #include "protocol.h" #include "buffer.h" + #include <m_string.h> +#include <mysql.h> /* implementation for Show_instances: */ diff --git a/server-tools/instance-manager/commands.h b/server-tools/instance-manager/commands.h index cd13bf09549..bab67f9c6b4 100644 --- a/server-tools/instance-manager/commands.h +++ b/server-tools/instance-manager/commands.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "command.h" #include "instance.h" -#include "my_global.h" /* Print all instances of this instance manager. diff --git a/server-tools/instance-manager/factory.cc b/server-tools/instance-manager/factory.cc index cde5d0564aa..538d9353983 100644 --- a/server-tools/instance-manager/factory.cc +++ b/server-tools/instance-manager/factory.cc @@ -15,11 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "factory.h" -#include "my_global.h" - -#include <stdio.h> -#include <ctype.h> - Show_instances *Command_factory::new_Show_instances() { diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 4fbfaf2672d..5d89f167f2f 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -20,10 +20,12 @@ #endif #include "guardian.h" + #include "instance_map.h" #include "instance.h" #include "mysql_manager_error.h" #include "log.h" + #include <string.h> #include <sys/types.h> #include <signal.h> diff --git a/server-tools/instance-manager/guardian.h b/server-tools/instance-manager/guardian.h index e43b5d565d7..502dc86b2ae 100644 --- a/server-tools/instance-manager/guardian.h +++ b/server-tools/instance-manager/guardian.h @@ -17,9 +17,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> +#include "thread_registry.h" + #include <my_sys.h> #include <my_list.h> -#include "thread_registry.h" #ifdef __GNUC__ #pragma interface diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 97282f3f800..f5effe68c64 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -19,16 +19,16 @@ #endif #include "instance.h" + #include "mysql_manager_error.h" #include "log.h" #include "instance_map.h" #include "priv.h" +#include <sys/wait.h> #include <my_sys.h> -#include <signal.h> #include <m_string.h> -#include <sys/wait.h> - +#include <mysql.h> C_MODE_START diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h index c141ff7b30d..14ef5cfcfb9 100644 --- a/server-tools/instance-manager/instance.h +++ b/server-tools/instance-manager/instance.h @@ -17,8 +17,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> -#include <my_sys.h> -#include <mysql.h> #include "instance_options.h" #ifdef __GNUC__ diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc index d19d42662e5..3e76c24a9a1 100644 --- a/server-tools/instance-manager/instance_map.cc +++ b/server-tools/instance-manager/instance_map.cc @@ -19,10 +19,11 @@ #endif #include "instance_map.h" + #include "buffer.h" #include "instance.h" + #include <m_ctype.h> -#include <my_sys.h> #include <mysql_com.h> #include <m_string.h> diff --git a/server-tools/instance-manager/instance_map.h b/server-tools/instance-manager/instance_map.h index 8d8ea33cf5d..46247c82a16 100644 --- a/server-tools/instance-manager/instance_map.h +++ b/server-tools/instance-manager/instance_map.h @@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> + +#include "protocol.h" +#include "guardian.h" + #include <my_sys.h> #include <hash.h> @@ -24,9 +28,6 @@ #pragma interface #endif -#include "protocol.h" -#include "guardian.h" - class Instance; extern int load_all_groups(char ***groups, const char *filename); extern void free_groups(char **groups); diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index e1b81bc93b1..0d602f88ad2 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -19,8 +19,10 @@ #endif #include "instance_options.h" + #include "parse_output.h" #include "buffer.h" + #include <my_sys.h> #include <mysql.h> #include <signal.h> diff --git a/server-tools/instance-manager/log.cc b/server-tools/instance-manager/log.cc index dbcea3f9c3d..5491b4e70e9 100644 --- a/server-tools/instance-manager/log.cc +++ b/server-tools/instance-manager/log.cc @@ -14,8 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "log.h" #include <my_global.h> + +#include "log.h" + #include <stdarg.h> #include <m_string.h> #include <my_sys.h> diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index 8629c5e9d9c..fd8673c4d66 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -14,6 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <my_global.h> #include "manager.h" #include "priv.h" @@ -25,7 +26,6 @@ #include "log.h" #include "guardian.h" -#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <signal.h> diff --git a/server-tools/instance-manager/messages.cc b/server-tools/instance-manager/messages.cc index e3c2423a47e..d044c0f65db 100644 --- a/server-tools/instance-manager/messages.cc +++ b/server-tools/instance-manager/messages.cc @@ -13,11 +13,14 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "messages.h" #include <my_global.h> -#include <mysql_com.h> +#include "messages.h" +#include "mysqld_error.h" +#include "mysql_manager_error.h" + +#include <mysql_com.h> #include <assert.h> diff --git a/server-tools/instance-manager/messages.h b/server-tools/instance-manager/messages.h index 4cc15b5efe4..b771efe5e13 100644 --- a/server-tools/instance-manager/messages.h +++ b/server-tools/instance-manager/messages.h @@ -16,9 +16,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mysqld_error.h" -#include "mysql_manager_error.h" - const char *message(unsigned sql_errno); const char *errno_to_sqlstate(unsigned sql_errno); diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 7947de70459..215dbe51b58 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -19,14 +19,10 @@ #endif #include "mysql_connection.h" -#include "priv.h" - -#include <mysql.h> -#include <violite.h> -#include <mysql_com.h> -#include <m_string.h> -#include <my_sys.h> +#include "priv.h" +#include "mysql_manager_error.h" +#include "mysqld_error.h" #include "thread_registry.h" #include "log.h" #include "user_map.h" @@ -36,6 +32,13 @@ #include "factory.h" #include "parse.h" +#include <mysql.h> +#include <violite.h> +#include <mysql_com.h> +#include <m_string.h> +#include <my_sys.h> + + Command *parse_command(Command_factory * factory, const char *text); Mysql_connection_thread_args::Mysql_connection_thread_args( diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index e1d267b492e..262686c3fab 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.cc @@ -14,11 +14,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <my_global.h> #include "manager.h" + #include "options.h" #include "log.h" -#include <my_global.h> #include <my_sys.h> #include <string.h> #include <signal.h> diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 9e4205b1407..4b5ec27f302 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -20,14 +20,13 @@ #include "options.h" -#include <my_global.h> +#include "priv.h" + #include <my_sys.h> #include <my_getopt.h> #include <m_string.h> #include <mysql_com.h> -#include "priv.h" - #define QUOTE2(x) #x #define QUOTE(x) QUOTE2(x) diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index 4c897ddf933..d3fb10b7c94 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "parse.h" + #include <string.h> enum Token diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc index 6fee0797395..77fa40ca352 100644 --- a/server-tools/instance-manager/parse_output.cc +++ b/server-tools/instance-manager/parse_output.cc @@ -14,10 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <my_global.h> #include "parse.h" #include <stdio.h> -#include <my_global.h> #include <my_sys.h> #include <string.h> diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc index 60cd0e8714f..9c8975a78be 100644 --- a/server-tools/instance-manager/protocol.cc +++ b/server-tools/instance-manager/protocol.cc @@ -14,13 +14,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <my_global.h> -#include <my_sys.h> +#include "protocol.h" + +#include "messages.h" + #include <mysql_com.h> #include <m_string.h> -#include "messages.h" -#include "protocol.h" static char eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ diff --git a/server-tools/instance-manager/protocol.h b/server-tools/instance-manager/protocol.h index 1102f95ff8f..b7b18b4b76c 100644 --- a/server-tools/instance-manager/protocol.h +++ b/server-tools/instance-manager/protocol.h @@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "buffer.h" + #include <my_list.h> typedef struct field { diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index bf01aa6d7b2..16821df4146 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -20,10 +20,11 @@ #include "thread_registry.h" +#include "log.h" + #include <assert.h> #include <signal.h> #include <thr_alarm.h> -#include "log.h" /* Kick-off signal handler */ diff --git a/server-tools/instance-manager/user_map.h b/server-tools/instance-manager/user_map.h index dcd2fd1494d..4c86edd93d9 100644 --- a/server-tools/instance-manager/user_map.h +++ b/server-tools/instance-manager/user_map.h @@ -17,10 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef __GNUC__ -#pragma interface +#pragma interface #endif #include <my_global.h> + #include <my_sys.h> #include <hash.h> |