Fix compilation without dlopen
This commit is contained in:
parent
906ce0962d
commit
204cb85aab
@ -1376,7 +1376,7 @@ static inline char *dlerror(void)
|
||||
#ifndef HAVE_DLADDR
|
||||
#define dladdr(A, B) 0
|
||||
/* Dummy definition in case we're missing dladdr() */
|
||||
typedef int Dl_info;
|
||||
typedef struct { const char *dli_fname, dli_fbase; } Dl_info;
|
||||
#endif
|
||||
#else
|
||||
#define dlerror() "No support for dynamic loading (static build?)"
|
||||
@ -1385,7 +1385,7 @@ typedef int Dl_info;
|
||||
#define dlclose(A) 0
|
||||
#define dladdr(A, B) 0
|
||||
/* Dummy definition in case we're missing dladdr() */
|
||||
typedef int Dl_info;
|
||||
typedef struct { const char *dli_fname, dli_fbase; } Dl_info;
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -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()
|
||||
{
|
||||
uint fl_length= 0;
|
||||
@ -611,6 +612,7 @@ void Item_udf_func::fix_num_length_and_dec()
|
||||
max_length= float_length(NOT_FIXED_DEC);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
|
@ -477,6 +477,11 @@ static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl)
|
||||
sizeof(struct st_plugin_dl));
|
||||
DBUG_RETURN(tmp);
|
||||
}
|
||||
#else
|
||||
static struct st_plugin_dl *plugin_dl_find(const LEX_STRING *)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* HAVE_DLOPEN */
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# ft-index only supports x86-64 and cmake-2.8.9+
|
||||
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(
|
||||
"
|
||||
struct a {int b; int c; };
|
||||
|
Loading…
x
Reference in New Issue
Block a user