diff options
| author | unknown <kostja@bodhi.local> | 2006-11-17 18:19:49 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-17 18:19:49 +0300 |
| commit | 96b90824d4d2688ee9c73d34bed8927da396f1c4 (patch) | |
| tree | 2cb3bd680f1ab3538cd2098f016c85a8cbaeb30e /server-tools/instance-manager/commands.cc | |
| parent | 3bb267683bb916ac0403c69a38aeaa245a2d41e4 (diff) | |
| parent | a163ae30f23239e1f7a9efafc620e1bc74e009ba (diff) | |
| download | mariadb-git-96b90824d4d2688ee9c73d34bed8927da396f1c4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.local:/opt/local/work/m51lamp
server-tools/instance-manager/commands.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Resolve a merge conflict manually./Mysq
Diffstat (limited to 'server-tools/instance-manager/commands.cc')
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 7a5b17525ea..671b3f6b524 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -29,7 +29,6 @@ #include "guardian.h" #include "instance_map.h" #include "log.h" -#include "manager.h" #include "messages.h" #include "mysqld_error.h" #include "mysql_manager_error.h" |