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

into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
bb859ecd · svoj@april.(none) · 36be4318 · df606b28 · bb859ecd
Commit bb859ecd authored Sep 18, 2006 by svoj@april.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +4 -2

No files found.
--- 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)