Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
204cb85a
Commit
204cb85a
authored
Jan 20, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation without dlopen
parent
906ce096
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
include/my_global.h
include/my_global.h
+2
-2
sql/item_func.cc
sql/item_func.cc
+2
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+5
-0
storage/tokudb/CMakeLists.txt
storage/tokudb/CMakeLists.txt
+1
-1
No files found.
include/my_global.h
View file @
204cb85a
...
...
@@ -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
/*
...
...
sql/item_func.cc
View file @
204cb85a
...
...
@@ -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
/**
...
...
sql/sql_plugin.cc
View file @
204cb85a
...
...
@@ -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 */
...
...
storage/tokudb/CMakeLists.txt
View file @
204cb85a
# 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; };
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment