bk commit into 5.1 tree (georg:1.2331)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-18 17:28:17+02:00, georg@stripped +1 -0
  In current 5.1 build we don't build embedded server for windows (this will be
  fixed when 5.1-win will be pushed into main tree).
  Commenting the libmysqld and libmysqld/example subdirectories will allow us 
  to upgrade from cmake 2.2 to 2.4.

  CMakeLists.txt@stripped, 2006-09-18 17:28:14+02:00, georg@stripped +4 -2
    comment libmysqld and libmysqld/example directories

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1

--- 1.23/CMakeLists.txt	2006-09-18 17:28:26 +02:00
+++ 1.24/CMakeLists.txt	2006-09-18 17:28:26 +02:00
@@ -146,5 +146,7 @@
 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)