Skip to content

M
mariadb
Commit bb859ecd authored by svoj@april.(none)'s avatar svoj@april.(none)
Browse files
Options

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
parents 36be4318 df606b28
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
CMakeLists.txt
View file @ bb859ecd
...@@ -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