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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
82db3278
Commit
82db3278
authored
Dec 15, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for loading example plugin and add plugin.test
parent
e69df83d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
85 additions
and
6 deletions
+85
-6
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_example_plugin.inc
+16
-0
mysql-test/include/have_udf.inc
mysql-test/include/have_udf.inc
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+25
-5
mysql-test/r/have_dynamic_loading.require
mysql-test/r/have_dynamic_loading.require
+0
-0
mysql-test/r/have_example_plugin.require
mysql-test/r/have_example_plugin.require
+2
-0
mysql-test/r/plugin.result
mysql-test/r/plugin.result
+15
-0
mysql-test/t/plugin.test
mysql-test/t/plugin.test
+26
-0
No files found.
mysql-test/include/have_example_plugin.inc
0 → 100644
View file @
82db3278
#
# Check if server has support for loading udf's
# i.e it will support dlopen
#
--
require
r
/
have_dynamic_loading
.
require
disable_query_log
;
show
variables
like
"have_dynamic_loading"
;
enable_query_log
;
#
# Check if the variable EXAMPLE_PLUGIN is set
#
--
require
r
/
have_example_plugin
.
require
disable_query_log
;
eval
select
LENGTH
(
"
$EXAMPLE_PLUGIN
"
)
>
0
as
"have_example_plugin"
;
enable_query_log
;
mysql-test/include/have_udf.inc
View file @
82db3278
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Check if server has support for loading udf's
# Check if server has support for loading udf's
# i.e it will support dlopen
# i.e it will support dlopen
#
#
--
require
r
/
have_
udf
.
require
--
require
r
/
have_
dynamic_loading
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_dynamic_loading"
;
show
variables
like
"have_dynamic_loading"
;
enable_query_log
;
enable_query_log
;
...
...
mysql-test/mysql-test-run.pl
View file @
82db3278
...
@@ -159,6 +159,7 @@ our $exe_im;
...
@@ -159,6 +159,7 @@ our $exe_im;
our
$exe_my_print_defaults
;
our
$exe_my_print_defaults
;
our
$exe_perror
;
our
$exe_perror
;
our
$lib_udf_example
;
our
$lib_udf_example
;
our
$lib_example_plugin
;
our
$exe_libtool
;
our
$exe_libtool
;
our
$opt_bench
=
0
;
our
$opt_bench
=
0
;
...
@@ -1493,6 +1494,11 @@ sub executable_setup () {
...
@@ -1493,6 +1494,11 @@ sub executable_setup () {
mtr_file_exists
(
vs_config_dirs
('
sql
',
'
udf_example.dll
'),
mtr_file_exists
(
vs_config_dirs
('
sql
',
'
udf_example.dll
'),
"
$glob_basedir
/sql/.libs/udf_example.so
",);
"
$glob_basedir
/sql/.libs/udf_example.so
",);
# Look for the ha_example library
$lib_example_plugin
=
mtr_file_exists
(
vs_config_dirs
('
storage/example
',
'
ha_example.dll
'),
"
$glob_basedir
/storage/example/.libs/ha_example.so
",);
# Look for mysqltest executable
# Look for mysqltest executable
if
(
$glob_use_embedded_server
)
if
(
$glob_use_embedded_server
)
{
{
...
@@ -1648,6 +1654,14 @@ sub environment_setup () {
...
@@ -1648,6 +1654,14 @@ sub environment_setup () {
push
(
@ld_library_paths
,
dirname
(
$lib_udf_example
));
push
(
@ld_library_paths
,
dirname
(
$lib_udf_example
));
}
}
# --------------------------------------------------------------------------
# Add the path where mysqld will find ha_example.so
# --------------------------------------------------------------------------
if
(
$lib_example_plugin
)
{
push
(
@ld_library_paths
,
dirname
(
$lib_example_plugin
));
}
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
# Valgrind need to be run with debug libraries otherwise it's almost
# Valgrind need to be run with debug libraries otherwise it's almost
# impossible to add correct supressions, that means if "/usr/lib/debug"
# impossible to add correct supressions, that means if "/usr/lib/debug"
...
@@ -1922,10 +1936,11 @@ sub environment_setup () {
...
@@ -1922,10 +1936,11 @@ sub environment_setup () {
$ENV
{'
UDF_EXAMPLE_LIB
'}
=
$ENV
{'
UDF_EXAMPLE_LIB
'}
=
(
$lib_udf_example
?
basename
(
$lib_udf_example
)
:
"");
(
$lib_udf_example
?
basename
(
$lib_udf_example
)
:
"");
$ENV
{'
LD_LIBRARY_PATH
'}
=
# ----------------------------------------------------
(
$lib_udf_example
?
dirname
(
$lib_udf_example
)
:
"")
.
# Add the path where mysqld will find ha_example.so
(
$ENV
{'
LD_LIBRARY_PATH
'}
?
"
:
$ENV
{'LD_LIBRARY_PATH'}
"
:
"");
# ----------------------------------------------------
$ENV
{'
EXAMPLE_PLUGIN
'}
=
(
$lib_example_plugin
?
basename
(
$lib_example_plugin
)
:
"");
# ----------------------------------------------------
# ----------------------------------------------------
# We are nice and report a bit about our settings
# We are nice and report a bit about our settings
...
@@ -3609,6 +3624,9 @@ sub mysqld_arguments ($$$$$) {
...
@@ -3609,6 +3624,9 @@ sub mysqld_arguments ($$$$$) {
# Turn on logging, will be sent to tables
# Turn on logging, will be sent to tables
mtr_add_arg
(
$args
,
"
%s--log=
",
$prefix
);
mtr_add_arg
(
$args
,
"
%s--log=
",
$prefix
);
}
}
mtr_add_arg
(
$args
,
"
%s--plugin_dir=%s
",
$prefix
,
dirname
(
$lib_example_plugin
));
}
}
if
(
$type
eq
'
slave
'
)
if
(
$type
eq
'
slave
'
)
...
@@ -4480,7 +4498,9 @@ sub run_mysqltest ($) {
...
@@ -4480,7 +4498,9 @@ sub run_mysqltest ($) {
}
}
else
# component_id == mysqld
else
# component_id == mysqld
{
{
mtr_add_arg
(
$args
,
"
--socket=%s
",
$master
->
[
0
]
->
{'
path_sock
'});
# mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
mtr_add_arg
(
$args
,
"
--host=127.0.0.1
");
mtr_add_arg
(
$args
,
"
--port=%d
",
$master
->
[
0
]
->
{'
port
'});
mtr_add_arg
(
$args
,
"
--port=%d
",
$master
->
[
0
]
->
{'
port
'});
mtr_add_arg
(
$args
,
"
--database=test
");
mtr_add_arg
(
$args
,
"
--database=test
");
mtr_add_arg
(
$args
,
"
--user=%s
",
$opt_user
);
mtr_add_arg
(
$args
,
"
--user=%s
",
$opt_user
);
...
...
mysql-test/r/have_
udf
.require
→
mysql-test/r/have_
dynamic_loading
.require
View file @
82db3278
File moved
mysql-test/r/have_example_plugin.require
0 → 100644
View file @
82db3278
have_example_plugin
1
mysql-test/r/plugin.result
0 → 100644
View file @
82db3278
CREATE TABLE t1(a int) ENGINE=EXAMPLE;
Warnings:
Error 1286 Unknown table engine 'EXAMPLE'
DROP TABLE t1;
INSTALL PLUGIN example SONAME 'ha_example.so';
INSTALL PLUGIN EXAMPLE SONAME 'ha_example.so';
ERROR HY000: Function 'EXAMPLE' already exists
UNINSTALL PLUGIN example;
INSTALL PLUGIN example SONAME 'ha_example.so';
CREATE TABLE t1(a int) ENGINE=EXAMPLE;
SELECT * FROM t1;
a
DROP TABLE t1;
UNINSTALL PLUGIN non_exist;
ERROR 42000: PLUGIN non_exist does not exist
mysql-test/t/plugin.test
0 → 100644
View file @
82db3278
--
source
include
/
have_example_plugin
.
inc
CREATE
TABLE
t1
(
a
int
)
ENGINE
=
EXAMPLE
;
DROP
TABLE
t1
;
INSTALL
PLUGIN
example
SONAME
'ha_example.so'
;
--
error
1125
INSTALL
PLUGIN
EXAMPLE
SONAME
'ha_example.so'
;
UNINSTALL
PLUGIN
example
;
INSTALL
PLUGIN
example
SONAME
'ha_example.so'
;
CREATE
TABLE
t1
(
a
int
)
ENGINE
=
EXAMPLE
;
# Let's do some advanced ops with the example engine :)
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
# Waiting for fix to BUG#22694
#UNINSTALL PLUGIN example;
#UNINSTALL PLUGIN EXAMPLE;
--
error
1305
UNINSTALL
PLUGIN
non_exist
;
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