diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-18 00:32:06 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-18 00:32:06 +0400 |
| commit | fe54b274db6b900aa7911769f860dca721a6e81f (patch) | |
| tree | a96990e871c1cf4dfff9b9b751753954581cbe9c | |
| parent | f4f7e1f42c831152d750a0f159db7bae1b756601 (diff) | |
| download | mariadb-git-fe54b274db6b900aa7911769f860dca721a6e81f.tar.gz | |
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:
Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
Let loading libraries in the embedded server
libmysqld/CMakeLists.txt:
Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
let loading libraries in the embedded server
mysql-test/t/windows.test:
Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
make sure proc_1() doesn't exists before we start
| -rw-r--r-- | include/mysql_embed.h | 1 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mysql-test/t/windows.test | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql_embed.h b/include/mysql_embed.h index 7416283d83d..4a7fd3ef63c 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -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 --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index fb3316c303c..9fa7d46d466 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -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 --git a/mysql-test/t/windows.test b/mysql-test/t/windows.test index 0be81a95b9a..92ca0c3a3ec 100644 --- a/mysql-test/t/windows.test +++ b/mysql-test/t/windows.test @@ -36,6 +36,9 @@ EXPLAIN SELECT * FROM t1 WHERE b = (SELECT max(2)); --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 |