diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-09-18 17:45:29 +0200 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-09-18 17:45:29 +0200 |
| commit | ba7a873172cbff6ee686c43f2a02ec13ada72ad3 (patch) | |
| tree | f2401b3b2224586230c2a01f043981949c0720b2 | |
| parent | 809d1cfe2f62287776b98952da09298b90ab0067 (diff) | |
| parent | df606b28b14efb7042eae8f60f6c69fd736a65ea (diff) | |
| download | mariadb-git-ba7a873172cbff6ee686c43f2a02ec13ada72ad3.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9814b80793c..3ea2dc1fbe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,5 +146,7 @@ ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(server-tools/instance-manager) ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(tests) -ADD_SUBDIRECTORY(libmysqld) -ADD_SUBDIRECTORY(libmysqld/examples) + +# disable libmysqld until it's fixed, so we can use Cmake 2.2 and 2.4 +#ADD_SUBDIRECTORY(libmysqld) +#ADD_SUBDIRECTORY(libmysqld/examples) |