Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
This commit is contained in:
commit
86b4ca8480
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user