diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
| commit | 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 (patch) | |
| tree | 87e5f83097f30c9fb7e30928800bcc92690f6bbd /strings/CMakeLists.txt | |
| parent | 9538bbfce9055f99529adb461d101b7b236eb5a3 (diff) | |
| download | mariadb-git-0b6c4bb34f99b8f4023fd0bef25a1b714f96b699.tar.gz | |
MDEV-4928 Merge collation customization improvements
Merging the following MySQL-5.6 changes:
- WL#5624: Collation customization improvements
http://dev.mysql.com/worklog/task/?id=5624
- WL#4013: Unicode german2 collation
http://dev.mysql.com/worklog/task/?id=4013
- Bug#62429 XML: ExtractValue, UpdateXML max arg length 127 chars
http://bugs.mysql.com/bug.php?id=62429
(required by WL#5624)
Diffstat (limited to 'strings/CMakeLists.txt')
| -rw-r--r-- | strings/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index 2747374058d..1b26b3d962a 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -32,3 +32,6 @@ ENDIF() # Avoid dependencies on perschema data defined in mysys ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H) ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES}) + +ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c) +TARGET_LINK_LIBRARIES(conf_to_src strings) |