diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-05 17:27:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-05 17:27:41 +0100 |
| commit | 5eb145858da92b01102db72883b4f3c7a50fbb15 (patch) | |
| tree | f8d4fac657ddd41f524e15bc02991d4ea5568192 /storage | |
| parent | b25951cc5e80961beb5bf11028b8a00e94e64372 (diff) | |
| download | mariadb-git-5eb145858da92b01102db72883b4f3c7a50fbb15.tar.gz | |
more solaris fixes. xtradb and spider.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/hs_client/socket.cpp | 1 | ||||
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/xtradb/plugin_exports | 10 |
3 files changed, 8 insertions, 5 deletions
diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp index 6515987124c..769bd0b497c 100644 --- a/storage/spider/hs_client/socket.cpp +++ b/storage/spider/hs_client/socket.cpp @@ -8,6 +8,7 @@ */ #ifndef __WIN__ +#include <sys/types.h> #include <sys/un.h> #endif diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index 48bd110fb4f..0c63afd744e 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -399,7 +399,7 @@ ENDIF() # Only required for old GCC (3.4.3) that does not support hidden visibility IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_VISIBILITY_HIDDEN) - SET(LINKER_SCRIPT "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/plugin_exports") + SET(LINKER_SCRIPT "-Wl,-M${CMAKE_CURRENT_SOURCE_DIR}/plugin_exports") ELSE() SET(LINKER_SCRIPT) ENDIF() diff --git a/storage/xtradb/plugin_exports b/storage/xtradb/plugin_exports index 4cf45ee4ccd..235ae3d5e72 100644 --- a/storage/xtradb/plugin_exports +++ b/storage/xtradb/plugin_exports @@ -3,10 +3,12 @@ _maria_plugin_interface_version_; _maria_sizeof_struct_st_plugin_; _maria_plugin_declarations_; - _mysql_plugin_interface_version_; - _mysql_sizeof_struct_st_plugin_; - _mysql_plugin_declarations_; - *_service; + my_snprintf_service; + thd_alloc_service; + thd_autoinc_service; + thd_error_context_service; + thd_kill_statement_service; + thd_wait_service; local: *; }; |