Fix compilation without dlopen

MariaDB · Jan 22, 2018 · 204cb85 · 204cb85
1 parent 906ce09
commit 204cb85
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/include/my_global.h b/include/my_global.h
@@ -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
 
 /*

diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -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
 
 
 /**

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
@@ -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 */
 
 

diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
@@ -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; };