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
9cb0bb1d
Commit
9cb0bb1d
authored
May 21, 2024
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restore the error message that was changed by mistake
add a test case
parent
443aa52c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
mysql-test/main/plugin.result
mysql-test/main/plugin.result
+2
-0
mysql-test/main/plugin.test
mysql-test/main/plugin.test
+4
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+2
-1
No files found.
mysql-test/main/plugin.result
View file @
9cb0bb1d
CREATE TABLE t1(a int) ENGINE=EXAMPLE;
CREATE TABLE t1(a int) ENGINE=EXAMPLE;
ERROR 42000: Unknown storage engine 'EXAMPLE'
ERROR 42000: Unknown storage engine 'EXAMPLE'
INSTALL PLUGIN non_exist SONAME 'ha_example';
ERROR HY000: Can't find symbol 'non_exist' in library 'ha_example.so'
INSTALL PLUGIN example SONAME 'ha_example';
INSTALL PLUGIN example SONAME 'ha_example';
INSTALL PLUGIN EXAMPLE SONAME 'ha_example';
INSTALL PLUGIN EXAMPLE SONAME 'ha_example';
ERROR HY000: Plugin 'EXAMPLE' already installed
ERROR HY000: Plugin 'EXAMPLE' already installed
...
...
mysql-test/main/plugin.test
View file @
9cb0bb1d
...
@@ -4,6 +4,10 @@
...
@@ -4,6 +4,10 @@
--
error
ER_UNKNOWN_STORAGE_ENGINE
--
error
ER_UNKNOWN_STORAGE_ENGINE
CREATE
TABLE
t1
(
a
int
)
ENGINE
=
EXAMPLE
;
CREATE
TABLE
t1
(
a
int
)
ENGINE
=
EXAMPLE
;
--
replace_regex
/
\
.
dll
/.
so
/
--
error
ER_CANT_FIND_DL_ENTRY
INSTALL
PLUGIN
non_exist
SONAME
'ha_example'
;
INSTALL
PLUGIN
example
SONAME
'ha_example'
;
INSTALL
PLUGIN
example
SONAME
'ha_example'
;
--
replace_regex
/
\
.
dll
/.
so
/
--
replace_regex
/
\
.
dll
/.
so
/
--
error
ER_PLUGIN_INSTALLED
--
error
ER_PLUGIN_INSTALLED
...
...
sql/sql_plugin.cc
View file @
9cb0bb1d
...
@@ -1222,7 +1222,8 @@ static enum install_status plugin_add(MEM_ROOT *tmp_root, bool if_not_exists,
...
@@ -1222,7 +1222,8 @@ static enum install_status plugin_add(MEM_ROOT *tmp_root, bool if_not_exists,
DBUG_ASSERT
(
!
name
->
str
||
!
dupes
);
// dupes is ONLY for name->str == 0
DBUG_ASSERT
(
!
name
->
str
||
!
dupes
);
// dupes is ONLY for name->str == 0
if
(
errs
==
0
&&
oks
==
0
&&
!
dupes
)
// no plugin was found
if
(
errs
==
0
&&
oks
==
0
&&
!
dupes
)
// no plugin was found
my_error
(
ER_PLUGIN_IS_NOT_LOADED
,
MyFlags
,
name
->
str
);
my_error
(
ER_CANT_FIND_DL_ENTRY
,
MyFlags
,
name
->
str
,
tmp
.
plugin_dl
->
dl
.
str
);
plugin_dl_del
(
tmp
.
plugin_dl
);
plugin_dl_del
(
tmp
.
plugin_dl
);
if
(
errs
>
0
||
oks
+
dupes
==
0
)
if
(
errs
>
0
||
oks
+
dupes
==
0
)
...
...
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