bk commit into 6.0 tree (vvaintroub:1.2651)

[vvaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub.  When vvaintroub 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, 2008-05-09 15:57:44+02:00, vvaintroub@wva. +4 -0
  Fix embedded build errors:
  -  compile falcon in, if WITH_FALCON_STORAGE_ENGINE is set
  -  exclude vio SSL stuff,as SSL structures and function prototypes
  are define #ifndef EMBEDDED_LIBRARY

  libmysqld/CMakeLists.txt@stripped, 2008-05-09 15:57:41+02:00, vvaintroub@wva. +9 -0
    Build embedded server with falcon, to avoid unresolved symbol
    builtin_falcon_plugin

  storage/falcon/CMakeLists.txt@stripped, 2008-05-09 15:57:42+02:00, vvaintroub@wva. +8 -2
    Build embedded server with falcon, to avoid unresolved symbol
    builtin_falcon_plugin

  vio/viossl.c@stripped, 2008-05-09 15:57:42+02:00, vvaintroub@wva. +2 -2
    Fix compile error:
    put SSL functions in #ifndef EMBEDDED_LIBRARY

  vio/viosslfactories.c@stripped, 2008-05-09 15:57:42+02:00, vvaintroub@wva. +2 -0
    Fix compile error:
    put SSL functions in #ifndef EMBEDDED_LIBRARY 

diff -Nrup a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
--- a/libmysqld/CMakeLists.txt	2008-05-08 17:57:39 +02:00
+++ b/libmysqld/CMakeLists.txt	2008-05-09 15:57:41 +02:00
@@ -145,6 +145,14 @@ IF(WITH_CSV_STORAGE_ENGINE)
   ENDFOREACH(rpath)
 ENDIF(WITH_CSV_STORAGE_ENGINE)
 
+IF(WITH_FALCON_STORAGE_ENGINE)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/falcon ${CMAKE_SOURCE_DIR}/storage/falcon/TransformLib)
+  INCLUDE(${CMAKE_SOURCE_DIR}/storage/falcon/CMakeLists.txt)
+  FOREACH(rpath ${FALCON_SOURCES})
+    SET(LIB_SOURCES ${LIB_SOURCES} ../storage/falcon/${rpath})
+  ENDFOREACH(rpath)
+ENDIF(WITH_FALCON_STORAGE_ENGINE)
+
 SET(SOURCE_SUBLIBS FALSE)
                             
 SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
@@ -188,6 +196,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
            ../sql/partition_info.cc ../sql/sql_connect.cc 
            ../sql/scheduler.cc ../sql/sql_audit.cc ../sql/stacktrace.c
+           ../sql/ddl_blocker.cc ../sql/si_objects.cc
            ${GEN_SOURCES}
            ${LIB_SOURCES})
 
diff -Nrup a/storage/falcon/CMakeLists.txt b/storage/falcon/CMakeLists.txt
--- a/storage/falcon/CMakeLists.txt	2008-02-29 20:02:46 +01:00
+++ b/storage/falcon/CMakeLists.txt	2008-05-09 15:57:42 +02:00
@@ -30,7 +30,8 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studi
   SET(CMAKE_CXX_FLAGS_DEBUG_INIT "${CMAKE_CXX_FLAGS_DEBUG_INIT} /EHsc")
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
       CMAKE_GENERATOR MATCHES "Visual Studio 8")
-ADD_LIBRARY(ha_falcon
+
+SET(FALCON_SOURCES 
 		Agent.cpp 
 		Alias.cpp
 		AsciiBlob.cpp
@@ -598,4 +599,9 @@ ADD_LIBRARY(ha_falcon
 		TransFormLib/Transform.h
 		TransFormLib/TransformException.h
 		TransFormLib/TransformUtil.h
-		../../sql/handler.h)
+		../../sql/handler.h
+)
+IF(NOT SOURCE_SUBLIBS)
+	ADD_LIBRARY(ha_falcon ${FALCON_SOURCES} )
+	ADD_DEPENDENCIES(ha_falcon GenError)
+ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/vio/viossl.c b/vio/viossl.c
--- a/vio/viossl.c	2008-03-27 19:39:49 +01:00
+++ b/vio/viossl.c	2008-05-09 15:57:42 +02:00
@@ -172,7 +172,7 @@ void vio_ssl_delete(Vio *vio)
   vio_delete(vio);
 }
 
-
+#ifndef EMBEDDED_LIBRARY
 static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
                   int (*connect_accept_func)(SSL*))
 {
@@ -262,7 +262,7 @@ int sslconnect(struct st_VioSSLFd *ptr, 
   DBUG_ENTER("sslconnect");
   DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_connect));
 }
-
+#endif  /*EMBEDDED_LIBRARY*/
 
 int vio_ssl_blocking(Vio *vio __attribute__((unused)),
 		     my_bool set_blocking_mode,
diff -Nrup a/vio/viosslfactories.c b/vio/viosslfactories.c
--- a/vio/viosslfactories.c	2008-03-27 19:39:49 +01:00
+++ b/vio/viosslfactories.c	2008-05-09 15:57:42 +02:00
@@ -225,6 +225,7 @@ static void check_ssl_init()
   }
 }
 
+#ifndef EMBEDDED_LIBRARY
 /************************ VioSSLFd **********************************/
 static struct st_VioSSLFd *
 new_VioSSLFd(const char *key_file, const char *cert_file,
@@ -380,4 +381,5 @@ void free_vio_ssl_acceptor_fd(struct st_
   SSL_CTX_free(fd->ssl_context);
   my_free((uchar*) fd, MYF(0));
 }
+#endif /*EMBEDDED_LIBRARY*/
 #endif /* HAVE_OPENSSL */