diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-07-28 10:18:55 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-07-29 13:51:22 +0400 |
| commit | 4188ba9c1e0ea195adf00d9e6d11b29ef18b2109 (patch) | |
| tree | de48b73011f97be796ff8369bfaa834fb410a7a1 /mysql-test/suite/archive | |
| parent | cf30074c3ff6815d85bbd864b28adfe7949d340c (diff) | |
| download | mariadb-git-4188ba9c1e0ea195adf00d9e6d11b29ef18b2109.tar.gz | |
MDEV-7652 - More explanatory ERROR and WARNING messages when loading plugins
with plugin-load-add that are already registered at mysql.plugin
- issue just one error message, without this extra warning
- don't abuse ER_UDF_EXISTS, instead add a proper error message for plugins
- report started initialization for each plugin source
Diffstat (limited to 'mysql-test/suite/archive')
| -rw-r--r-- | mysql-test/suite/archive/archive_plugin.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/archive/archive_plugin.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/archive/archive_plugin.result b/mysql-test/suite/archive/archive_plugin.result index 90c1f10bf19..feb825f20ee 100644 --- a/mysql-test/suite/archive/archive_plugin.result +++ b/mysql-test/suite/archive/archive_plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN archive SONAME 'ha_archive.so'; INSTALL PLUGIN ARCHIVE SONAME 'ha_archive.so'; -ERROR HY000: Function 'ARCHIVE' already exists +ERROR HY000: Plugin 'ARCHIVE' already installed UNINSTALL PLUGIN archive; INSTALL PLUGIN archive SONAME 'ha_archive.so'; CREATE TABLE t1(a int) ENGINE=ARCHIVE; diff --git a/mysql-test/suite/archive/archive_plugin.test b/mysql-test/suite/archive/archive_plugin.test index ba80652fb02..8ea40114cca 100644 --- a/mysql-test/suite/archive/archive_plugin.test +++ b/mysql-test/suite/archive/archive_plugin.test @@ -7,7 +7,7 @@ DROP TABLE t1; --replace_regex /\.dll/.so/ eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; UNINSTALL PLUGIN archive; |