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
d9187582
Commit
d9187582
authored
Sep 28, 2010
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
8b833274
a77b145b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
mysql-test/README.suites
mysql-test/README.suites
+10
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+1
-2
No files found.
mysql-test/README.suites
View file @
d9187582
...
@@ -32,6 +32,16 @@ files cannot. Special options are
...
@@ -32,6 +32,16 @@ files cannot. Special options are
--
timezone
,
--
plugin
-
load
,
--
result
-
file
,
--
config
-
file
-
template
,
--
timezone
,
--
plugin
-
load
,
--
result
-
file
,
--
config
-
file
-
template
,
--
default
-
time
-
zone
,
--
force
-
restart
--
default
-
time
-
zone
,
--
force
-
restart
In
particular
,
all
--
plugin
-
load
instances
on
the
command
line
(
on
the
combined
command
line
,
assembled
from
different
.
opt
and
combinations
files
)
are
merged
into
one
.
That
is
,
if
,
say
,
test
-
master
.
opt
file
contains
--
plugin
-
load
=
aaa
.
so
and
suite
.
opt
has
--
plugin
-
load
=
bbb
.
so
that
mysqld
will
get
--
plugin
-
load
=
aaa
.
so
:
bbb
.
so
.
Also
,
empty
--
plugin
-
load
options
are
removed
from
the
command
line
.
Which
means
that
one
can
safely
specify
--
plugin
-
load
=$
AAA_SO
and
if
aaa
.
so
was
not
built
(
perhaps
,
the
plugin
was
statically
linked
into
the
server
),
the
.
opt
file
will
not
result
in
the
invalid
command
line
option
that
can
cause
the
server
to
refuse
to
start
.
==========================
==========================
A
suite
can
have
suite
.
pm
file
in
the
suitedir
.
It
must
declare
a
A
suite
can
have
suite
.
pm
file
in
the
suitedir
.
It
must
declare
a
package
that
inherits
from
My
::
Suite
.
package
that
inherits
from
My
::
Suite
.
...
...
sql/sql_plugin.cc
View file @
d9187582
...
@@ -3446,8 +3446,7 @@ void my_print_help_inc_plugins(my_option *main_options, uint size)
...
@@ -3446,8 +3446,7 @@ void my_print_help_inc_plugins(my_option *main_options, uint size)
{
{
p
=
*
dynamic_element
(
&
plugin_array
,
idx
,
struct
st_plugin_int
**
);
p
=
*
dynamic_element
(
&
plugin_array
,
idx
,
struct
st_plugin_int
**
);
if
(
!
p
->
plugin
->
system_vars
||
if
(
!
(
opt
=
construct_help_options
(
&
mem_root
,
p
)))
!
(
opt
=
construct_help_options
(
&
mem_root
,
p
)))
continue
;
continue
;
/* Only options with a non-NULL comment are displayed in help text */
/* Only options with a non-NULL comment are displayed in help text */
...
...
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