1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation without dlopen

Browse Source
This commit is contained in:
Sergei Golubchik 2018-01-20 11:45:23 +01:00
parent 906ce0962d
commit 204cb85aab
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_global.h
View File

@ -1376,7 +1376,7 @@ static inline char *dlerror(void)
#ifndef HAVE_DLADDR #ifndef HAVE_DLADDR
#define dladdr(A, B) 0 #define dladdr(A, B) 0
/* Dummy definition in case we're missing dladdr() */ /* Dummy definition in case we're missing dladdr() */
typedef int Dl_info; typedef struct { const char *dli_fname, dli_fbase; } Dl_info;
#endif #endif
#else #else
#define dlerror() "No support for dynamic loading (static build?)" #define dlerror() "No support for dynamic loading (static build?)"
@ -1385,7 +1385,7 @@ typedef int Dl_info;
#define dlclose(A) 0 #define dlclose(A) 0
#define dladdr(A, B) 0 #define dladdr(A, B) 0
/* Dummy definition in case we're missing dladdr() */ /* Dummy definition in case we're missing dladdr() */
typedef int Dl_info; typedef struct { const char *dli_fname, dli_fbase; } Dl_info;
#endif #endif
/* /*

2
sql/item_func.cc
View File

@ -595,6 +595,7 @@ my_decimal *Item_real_func::val_decimal(my_decimal *decimal_value)
} }
#ifdef HAVE_DLOPEN
void Item_udf_func::fix_num_length_and_dec() void Item_udf_func::fix_num_length_and_dec()
{ {
uint fl_length= 0; uint fl_length= 0;
@ -611,6 +612,7 @@ void Item_udf_func::fix_num_length_and_dec()
max_length= float_length(NOT_FIXED_DEC); max_length= float_length(NOT_FIXED_DEC);
} }
} }
#endif
/** /**

5
sql/sql_plugin.cc
View File

@ -477,6 +477,11 @@ static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl)
sizeof(struct st_plugin_dl)); sizeof(struct st_plugin_dl));
DBUG_RETURN(tmp); DBUG_RETURN(tmp);
} }
#else
static struct st_plugin_dl *plugin_dl_find(const LEX_STRING *)
{
return 0;
}
#endif /* HAVE_DLOPEN */ #endif /* HAVE_DLOPEN */

2
storage/tokudb/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# ft-index only supports x86-64 and cmake-2.8.9+ # ft-index only supports x86-64 and cmake-2.8.9+
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
NOT CMAKE_VERSION VERSION_LESS "2.8.9") NOT CMAKE_VERSION VERSION_LESS "2.8.9" AND HAVE_DLSYM)
CHECK_CXX_SOURCE_COMPILES( CHECK_CXX_SOURCE_COMPILES(
" "
struct a {int b; int c; }; struct a {int b; int c; };