diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
| commit | a962160eec233c265900e2754ed2a63ef5e27c5a (patch) | |
| tree | f1b33a7aed53016189b17cd3f50243b3c8a022de /regex/CMakeLists.txt | |
| parent | 166e0683c0d45a79716d8913ec9ecaf3177343fa (diff) | |
| parent | 9b7a7f06c1a56f49a4528f019ec821d3a01934b6 (diff) | |
| download | mariadb-git-a962160eec233c265900e2754ed2a63ef5e27c5a.tar.gz | |
Merge with MySQL 5.1, with following additions:
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
This is a re-commit of Monty's merge to eliminate an extra commit from
MySQL-5.1.42 that was accidentally included in the merge.
This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In
case there are any extra changes done before final MySQL 5.1.41
release, these will need to be merged later before MariaDB 5.1.41
release.
Diffstat (limited to 'regex/CMakeLists.txt')
| -rwxr-xr-x | regex/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index a3088c00357..2e3b18c7bb0 100755 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt @@ -18,7 +18,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUT INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) -SET(REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) +SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) IF(NOT SOURCE_SUBLIBS) ADD_LIBRARY(regex ${REGEX_SOURCES}) |