bzr push into mysql-5.1 branch (stewart:2816 to 2818)

[Stewart Smith]

 2818 Stewart Smith	2008-08-27
      update config.cmake to support building of embedded server, remove old bdb, fix
partitioning description.
modified:
  config.cmake

 2817 Stewart Smith	2008-08-27
      add extern C to my_times.h (times(2) for Win32)
modified:
  include/my_times.h

 2816 Stewart Smith	2008-08-27
      correct typo of GlobalData.cpp
modified:
  storage/ndb/src/kernel/vm/CMakeLists.txt

=== modified file 'config.cmake'
--- a/config.cmake	2008-08-21 15:30:00 +0000
+++ b/config.cmake	2008-08-27 06:49:57 +0000
@@ -90,13 +90,13 @@ SET(EMBED_MANIFESTS FALSE CACHE BOOL "Em
 SET(DISABLE_GRANT_OPTIONS FALSE CACHE BOOL "Disable grant options")
 
 SET(WITH_ARCHIVE_STORAGE_ENGINE FALSE CACHE BOOL "Include Archive engine")
-SET(WITH_BERKELEY_STORAGE_ENGINE FALSE CACHE BOOL "Include Berkeley engine")
 SET(WITH_BLACKHOLE_STORAGE_ENGINE FALSE CACHE BOOL "Include Blackhole engine")
 SET(WITH_EXAMPLE_STORAGE_ENGINE FALSE CACHE BOOL "Include Example engine")
 SET(WITH_FEDERATED_STORAGE_ENGINE FALSE CACHE BOOL "Include Federated")
 SET(WITH_INNOBASE_STORAGE_ENGINE FALSE CACHE BOOL "Include InnoDB engine")
-SET(WITH_PARTITION_STORAGE_ENGINE FALSE CACHE BOOL "Include NDB Cluster")
+SET(WITH_PARTITION_STORAGE_ENGINE FALSE CACHE BOOL "Include Table partitioning")
 SET(WITH_NDBCLUSTER_STORAGE_ENGINE FALSE CACHE BOOL "Include NDB Cluster")
+SET(WITH_EMBEDDED_SERVER FALSE CACHE BOOL "Include embedded server (libmysqld)")
 
 IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
   SET(WITH_PARTITION_STORAGE_ENGINE TRUE)

=== modified file 'include/my_times.h'
--- a/include/my_times.h	2008-08-21 06:36:31 +0000
+++ b/include/my_times.h	2008-08-27 06:41:29 +0000
@@ -16,6 +16,10 @@
 #ifndef _MY_TIMES_H_
 #define _MY_TIMES_H_
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #ifdef __WIN__
 struct tms {
   clock_t tms_utime;  /* user time */
@@ -29,4 +33,8 @@ clock_t times(struct tms *buf);
 #include <sys/times.h>
 #endif
 
+#ifdef __cplusplus
+} // extern C
+#endif
+
 #endif