diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
| commit | 6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5 (patch) | |
| tree | fb563e643d6b42feb801c036272d89d964b5ed48 /sql/CMakeLists.txt | |
| parent | 97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977 (diff) | |
| parent | 29bd01e6c11c0d9df7f556f157b1b00e06306f60 (diff) | |
| download | mariadb-git-6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5.tar.gz | |
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
BitKeeper/deleted/.del-README~1:
SCCS merged
BitKeeper/deleted/.del-configure.js:
ul
dbug/CMakeLists.txt:
SCCS merged
extra/CMakeLists.txt:
SCCS merged
extra/yassl/CMakeLists.txt:
SCCS merged
extra/yassl/taocrypt/CMakeLists.txt:
SCCS merged
scripts/CMakeLists.txt:
SCCS merged
server-tools/instance-manager/CMakeLists.txt:
SCCS merged
sql/CMakeLists.txt:
SCCS merged
storage/myisam/CMakeLists.txt:
SCCS merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 7e0d28070ad..1400c1487d0 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -84,7 +84,7 @@ ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX} ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc ${PROJECT_SOURCE_DIR}/sql/lex_hash.h) TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} - heap myisam myisammrg mysys yassl zlib dbug yassl + heap myisam myisammrg mysys yassl zlib debug dbug yassl taocrypt strings vio regex wsock32 ws2_32) IF(EMBED_MANIFESTS) |