diff options
| author | jbruehe/mysqldev@mysql.com/production.mysql.com <> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | jbruehe/mysqldev@mysql.com/production.mysql.com <> | 2007-08-16 18:21:47 +0200 |
| commit | 2d4efab3661f12e85b111c97a524b4d5e5b1b592 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /server-tools | |
| parent | f07738caac5497de8c896670e9ea53dc5c1e5fbe (diff) | |
| parent | 0e5e36421815d2c2bc67942362bebe3a2fba6b76 (diff) | |
| download | mariadb-git-2d4efab3661f12e85b111c97a524b4d5e5b1b592.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
Diffstat (limited to 'server-tools')
| -rwxr-xr-x | server-tools/instance-manager/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt index d11507229bf..2b9bce56ff7 100755 --- a/server-tools/instance-manager/CMakeLists.txt +++ b/server-tools/instance-manager/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc - thread_registry.cc user_map.cc imservice.cpp windowsservice.cpp + thread_registry.cc user_map.cc IMService.cpp WindowsService.cpp user_management_commands.cc ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c |