bk commit into 5.1 tree (holyfoot:1.2621) BUG#32211

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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, 2007-11-18 00:32:06+04:00, holyfoot@stripped +3 -0
  Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
  
  failing 'INSTALL PLUGIN' statement doesn't work in embedded server
  as we disable library loading there.
  Fixed by enabling loading libraries (#define HAVE_DLOPEN), what also
  makes UDF working in the embedded server.

  include/mysql_embed.h@stripped, 2007-11-18 00:32:04+04:00, holyfoot@stripped +0 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    Let loading libraries in the embedded server

  libmysqld/CMakeLists.txt@stripped, 2007-11-18 00:32:04+04:00, holyfoot@stripped +1 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    let loading libraries in the embedded server

  mysql-test/t/windows.test@stripped, 2007-11-18 00:32:04+04:00, holyfoot@stripped +3 -0
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    make sure proc_1() doesn't exists before we start

diff -Nrup a/include/mysql_embed.h b/include/mysql_embed.h
--- a/include/mysql_embed.h	2006-12-23 23:04:05 +04:00
+++ b/include/mysql_embed.h	2007-11-18 00:32:04 +04:00
@@ -21,7 +21,6 @@
 /* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
 
 #undef HAVE_PSTACK				/* No stacktrace */
-#undef HAVE_DLOPEN				/* No udf functions */
 #undef HAVE_OPENSSL
 #undef HAVE_SMEM				/* No shared memory */
 #undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
diff -Nrup a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
--- a/libmysqld/CMakeLists.txt	2007-08-07 02:14:47 +05:00
+++ b/libmysqld/CMakeLists.txt	2007-11-18 00:32:04 +04:00
@@ -22,7 +22,7 @@ IF(WIN32)
   ADD_DEFINITIONS(-DUSE_TLS)
 ENDIF(WIN32)
 
-ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY)
+ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY -DHAVE_DLOPEN)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/libmysqld
diff -Nrup a/mysql-test/t/windows.test b/mysql-test/t/windows.test
--- a/mysql-test/t/windows.test	2007-04-29 18:47:34 +05:00
+++ b/mysql-test/t/windows.test	2007-11-18 00:32:04 +04:00
@@ -36,6 +36,9 @@ EXPLAIN SELECT * FROM t1 WHERE b =  (SEL
 
 --echo End of 5.0 tests.
 
+--disable_warnings
+drop procedure if exists proc_1;
+--enable_warnings
 #
 # Bug #20665: All commands supported in Stored Procedures should work in
 # Prepared Statements