summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
commitb85b8348e761e38dcc2d49d171b7e28c32397374 (patch)
tree03d22c6ea95877ab0d833292cc791a5a2dd0eac9 /client
parent391f6b4f1ebe4dccfaf0181257aa46edb6253015 (diff)
parent528abc749e8a65674dd10f59a2d99d7841709939 (diff)
downloadmariadb-git-b85b8348e761e38dcc2d49d171b7e28c32397374.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'client')
-rw-r--r--client/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 37087b7c6c6..5822c9f6f08 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -81,9 +81,8 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlslap ${CLIENT_LIB})
-# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
IF(WIN32)
- MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
+ MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Test)
ENDIF(WIN32)
# async_example is just a code example, do not install it.