Commit 72689aad authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com

Merge 192.168.0.10:mysql/mysql-5.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
parents ac10ad6b adf20e35
...@@ -17,9 +17,8 @@ ...@@ -17,9 +17,8 @@
#pragma implementation #pragma implementation
#endif #endif
#include "command.h"
#include "manager.h" #include "manager.h"
#include "command.h"
Command::Command() Command::Command()
:guardian(Manager::get_guardian()), :guardian(Manager::get_guardian()),
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#pragma implementation #pragma implementation
#endif #endif
#include "instance.h"
#include <mysql.h> #include <mysql.h>
...@@ -26,8 +25,9 @@ ...@@ -26,8 +25,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#include "guardian.h"
#include "manager.h" #include "manager.h"
#include "guardian.h"
#include "instance.h"
#include "log.h" #include "log.h"
#include "mysql_manager_error.h" #include "mysql_manager_error.h"
#include "portability.h" #include "portability.h"
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "thread_registry.h" #include "thread_registry.h"
#include "instance_map.h" #include "instance_map.h"
/************************************************************************* /*************************************************************************
{{{ Platform-specific functions. {{{ Platform-specific functions.
*************************************************************************/ *************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment