Skip to content

M
mariadb
Commit 86b4ca84 authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal:/home/bk/mysql-5.1 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
parents c8e15b21 c690c11f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
CMakeLists.txt
View file @ 86b4ca84
...@@ -146,5 +146,7 @@ ADD_SUBDIRECTORY(sql) ...@@ -146,5 +146,7 @@ ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager) ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(tests) 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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7