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
ba658599
Commit
ba658599
authored
Apr 19, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
faee7004
210af244
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
13 deletions
+15
-13
mysql-test/include/have_udf.inc
mysql-test/include/have_udf.inc
+5
-9
mysql-test/r/have_udf.require
mysql-test/r/have_udf.require
+2
-1
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+6
-1
sql/set_var.cc
sql/set_var.cc
+1
-0
No files found.
mysql-test/include/have_udf.inc
View file @
ba658599
#
# To check if the udf_example.so is available,
# try to load one function from it.
#
# Check if server has support for loading udf's
# i.e it will support dlopen
#
--
require
r
/
have_udf
.
require
--
disable_abort_on_error
CREATE
FUNCTION
metaphon
RETURNS
STRING
SONAME
'udf_example.so'
;
--
disable_query_log
DROP
FUNCTION
metaphon
;
--
enable_query_log
--
enable_abort_on_error
disable_query_log
;
show
variables
like
"have_dynamic_loading"
;
enable_query_log
;
mysql-test/r/have_udf.require
View file @
ba658599
CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
Variable_name Value
have_dynamic_loading YES
mysql-test/t/disabled.def
View file @
ba658599
...
...
@@ -12,4 +12,3 @@
sp-goto : GOTO is currently is disabled - will be fixed in the future
ndb_load : Bug#17233
udf : Bug#18564 (Permission by Brian)
sql/mysql_priv.h
View file @
ba658599
...
...
@@ -1299,7 +1299,7 @@ extern SHOW_COMP_OPTION have_ndbcluster;
#endif
extern
SHOW_COMP_OPTION
have_isam
;
extern
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
;
extern
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
,
have_dlopen
;
extern
SHOW_COMP_OPTION
have_query_cache
;
extern
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
;
extern
SHOW_COMP_OPTION
have_crypt
;
...
...
sql/mysqld.cc
View file @
ba658599
...
...
@@ -490,7 +490,7 @@ CHARSET_INFO *character_set_filesystem;
SHOW_COMP_OPTION
have_isam
;
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
,
have_query_cache
;
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
;
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
,
have_dlopen
;
SHOW_COMP_OPTION
have_crypt
,
have_compress
;
/* Thread specific variables */
...
...
@@ -6440,6 +6440,11 @@ static void mysql_init_variables(void)
#else
have_symlink
=
SHOW_OPTION_YES
;
#endif
#ifdef HAVE_DLOPEN
have_dlopen
=
SHOW_OPTION_YES
;
#else
have_dlopen
=
SHOW_OPTION_NO
;
#endif
#ifdef HAVE_QUERY_CACHE
have_query_cache
=
SHOW_OPTION_YES
;
#else
...
...
sql/set_var.cc
View file @
ba658599
...
...
@@ -803,6 +803,7 @@ struct show_var_st init_vars[]= {
{
"have_compress"
,
(
char
*
)
&
have_compress
,
SHOW_HAVE
},
{
"have_crypt"
,
(
char
*
)
&
have_crypt
,
SHOW_HAVE
},
{
"have_csv"
,
(
char
*
)
&
have_csv_db
,
SHOW_HAVE
},
{
"have_dynamic_loading"
,
(
char
*
)
&
have_dlopen
,
SHOW_HAVE
},
{
"have_example_engine"
,
(
char
*
)
&
have_example_db
,
SHOW_HAVE
},
{
"have_federated_engine"
,
(
char
*
)
&
have_federated_db
,
SHOW_HAVE
},
{
"have_geometry"
,
(
char
*
)
&
have_geometry
,
SHOW_HAVE
},
...
...
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