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
e70f8dc4
Commit
e70f8dc4
authored
Jan 26, 2008
by
acurtis/antony@ltamd64.xiphis.org
Browse files
Options
Browse Files
Download
Plain Diff
Merge xiphis.org:/anubis/antony/work/bug33358.2
into xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
parents
8629f2e3
82839a0b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
mysql-test/t/plugin_load-master.opt
mysql-test/t/plugin_load-master.opt
+1
-1
sql/sql_plugin.cc
sql/sql_plugin.cc
+2
-3
No files found.
mysql-test/t/plugin_load-master.opt
View file @
e70f8dc4
$EXAMPLE_PLUGIN_OPT
"--plugin-load=;EXAMPLE=ha_example.so;"
--plugin-example-enum-var=e2
--
loose-
plugin-example-enum-var=e2
sql/sql_plugin.cc
View file @
e70f8dc4
...
...
@@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, int flags)
/* Register all dynamic plugins */
if
(
!
(
flags
&
PLUGIN_INIT_SKIP_DYNAMIC_LOADING
))
{
if
(
opt_plugin_load
&&
plugin_load_list
(
&
tmp_root
,
argc
,
argv
,
opt_plugin_load
))
goto
err
;
if
(
opt_plugin_load
)
plugin_load_list
(
&
tmp_root
,
argc
,
argv
,
opt_plugin_load
);
if
(
!
(
flags
&
PLUGIN_INIT_SKIP_PLUGIN_TABLE
))
plugin_load
(
&
tmp_root
,
argc
,
argv
);
}
...
...
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