1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restore the error message that was changed by mistake

Browse Source 
add a test case
This commit is contained in:
Sergei Golubchik 2024-05-21 20:35:00 +02:00
parent 443aa52c35
commit 9cb0bb1de0
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/plugin.result
View File

@ -1,5 +1,7 @@
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

4
mysql-test/main/plugin.test
View File

@ -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

3
sql/sql_plugin.cc
View File

@ -1222,7 +1222,8 @@ err:
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)