diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
| commit | c4c200749a200a7e89ecc6d09c3c41941e0ff50e (patch) | |
| tree | 5e647c8d2eafbe6efdbb0d34399a6cd420049da2 /storage/myisam | |
| parent | f2204146721cd2257ccc1f5954db680aa58b06ed (diff) | |
| parent | e31f5611aadf37fb7436de255120cbc8bcbb4fb5 (diff) | |
| download | mariadb-git-c4c200749a200a7e89ecc6d09c3c41941e0ff50e.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
libmysql/CMakeLists.txt:
merge fix
Diffstat (limited to 'storage/myisam')
| -rwxr-xr-x | storage/myisam/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index ec7cde9a789..de2880298b5 100755 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt @@ -38,16 +38,16 @@ ADD_LIBRARY(myisam ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c f rt_split.c sort.c sp_key.c ft_eval.h myisamdef.h rt_index.h mi_rkey.c) ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c) -TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamchk myisamchk.c) -TARGET_LINK_LIBRARIES(myisamchk myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamlog myisamlog.c) -TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisampack myisampack.c) -TARGET_LINK_LIBRARIES(myisampack myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32) IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker") |