Merge 192.168.0.10:mysql/mysql-5.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint

server-tools/instance-manager/command.cc

@@ -17,9 +17,8 @@
 #pragma implementation
 #endif
 
-#include "command.h"
 #include "manager.h"
-
+#include "command.h"
 
 Command::Command()
   :guardian(Manager::get_guardian()),

server-tools/instance-manager/instance.cc

@@ -17,7 +17,6 @@
 #pragma implementation
 #endif
 
-#include "instance.h"
 
 #include <mysql.h>
 
@@ -26,8 +25,9 @@
 #include <sys/wait.h>
 #endif
 
-#include "guardian.h"
 #include "manager.h"
+#include "guardian.h"
+#include "instance.h"
 #include "log.h"
 #include "mysql_manager_error.h"
 #include "portability.h"
@@ -35,6 +35,7 @@
 #include "thread_registry.h"
 #include "instance_map.h"
 
+
 /*************************************************************************
   {{{ Platform-specific functions.
 *************************************************************************/