diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-11-01 16:49:39 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-11-01 16:49:39 +0100 |
| commit | 181f564bfa58e539bbcff16874016c5e1481a8e1 (patch) | |
| tree | 62fbc1800ae09244e6b369413d914fa186b335f8 /client/CMakeLists.txt | |
| parent | 17e9db8cdbb787b9a1798e05e9ec520067491d90 (diff) | |
| parent | 2a415a2f9d92e1b07eb308a42ea8d84e8da1ec3f (diff) | |
| download | mariadb-git-181f564bfa58e539bbcff16874016c5e1481a8e1.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
into pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
client/CMakeLists.txt:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
client/Makefile.am:
Merge 5.0->5.1
client/mysqltest.c:
Merge 5.0->5.1
Diffstat (limited to 'client/CMakeLists.txt')
| -rwxr-xr-x | client/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 2ef55c23c90..a20db4134c2 100755 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -32,7 +32,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c) TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32) -ADD_EXECUTABLE(mysqltest mysqltest.c ../mysys/my_getsystime.c ../mysys/my_copy.c) +ADD_EXECUTABLE(mysqltest mysqltest.c ../mysys/my_getsystime.c + ../mysys/my_copy.c ../mysys/my_mkdir.c) TARGET_LINK_LIBRARIES(mysqltest mysqlclient_notls regex wsock32) ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |