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
d9dc2c3d
Commit
d9dc2c3d
authored
May 15, 2009
by
Kristofer Pettersson
Browse files
Options
Browse Files
Download
Plain Diff
Auto merge
parents
52973c14
8b39abe2
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
213 additions
and
139 deletions
+213
-139
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+1
-1
mysys/my_getopt.c
mysys/my_getopt.c
+2
-1
sql/sql_plugin.cc
sql/sql_plugin.cc
+209
-137
sql/sql_plugin.h
sql/sql_plugin.h
+1
-0
No files found.
mysql-test/lib/mtr_cases.pm
View file @
d9dc2c3d
...
@@ -887,7 +887,7 @@ sub collect_one_test_case {
...
@@ -887,7 +887,7 @@ sub collect_one_test_case {
if
(
$tinfo
->
{'
innodb_test
'}
)
if
(
$tinfo
->
{'
innodb_test
'}
)
{
{
# This is a test that need innodb
# This is a test that need innodb
if
(
$::mysqld_variables
{'
innodb
'}
ne
"
TRUE
"
)
if
(
$::mysqld_variables
{'
innodb
'}
eq
"
OFF
"
)
{
{
# innodb is not supported, skip it
# innodb is not supported, skip it
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
skip
'}
=
1
;
...
...
mysys/my_getopt.c
View file @
d9dc2c3d
...
@@ -410,7 +410,8 @@ invalid value '%s'",
...
@@ -410,7 +410,8 @@ invalid value '%s'",
argument
=
optend
;
argument
=
optend
;
}
}
else
if
(
optp
->
arg_type
==
OPT_ARG
&&
else
if
(
optp
->
arg_type
==
OPT_ARG
&&
(
optp
->
var_type
&
GET_TYPE_MASK
)
==
GET_BOOL
)
(((
optp
->
var_type
&
GET_TYPE_MASK
)
==
GET_BOOL
)
||
(
optp
->
var_type
&
GET_TYPE_MASK
)
==
GET_ENUM
))
{
{
if
(
optend
==
disabled_my_option
)
if
(
optend
==
disabled_my_option
)
*
((
my_bool
*
)
value
)
=
(
my_bool
)
0
;
*
((
my_bool
*
)
value
)
=
(
my_bool
)
0
;
...
...
sql/sql_plugin.cc
View file @
d9dc2c3d
This diff is collapsed.
Click to expand it.
sql/sql_plugin.h
View file @
d9dc2c3d
...
@@ -79,6 +79,7 @@ struct st_plugin_int
...
@@ -79,6 +79,7 @@ struct st_plugin_int
void
*
data
;
/* plugin type specific, e.g. handlerton */
void
*
data
;
/* plugin type specific, e.g. handlerton */
MEM_ROOT
mem_root
;
/* memory for dynamic plugin structures */
MEM_ROOT
mem_root
;
/* memory for dynamic plugin structures */
sys_var
*
system_vars
;
/* server variables for this plugin */
sys_var
*
system_vars
;
/* server variables for this plugin */
bool
is_mandatory
;
/* If true then plugin must not fail to load */
};
};
...
...
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