diff options
| author | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
| commit | 6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /server-tools | |
| parent | c492a2392e283b6448cac2b3813b5a8b3906df93 (diff) | |
| parent | 1c47af79da738cbba009d2801da0cfb8ee45a3da (diff) | |
| download | mariadb-git-6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/log_event.cc:
Manual merge, later version of the fix takes precedence.
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 |