diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/blackhole_plugin.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/plugin.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/archive/archive_plugin.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/archive/archive_plugin.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/blackhole_plugin.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/plugin.test | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/blackhole_plugin.result b/mysql-test/r/blackhole_plugin.result index 4ef9fa0fa47..dd1b95ab0d9 100644 --- a/mysql-test/r/blackhole_plugin.result +++ b/mysql-test/r/blackhole_plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so'; INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so'; -ERROR HY000: Function 'BLACKHOLE' already exists +ERROR HY000: Plugin 'BLACKHOLE' already installed UNINSTALL PLUGIN blackhole; INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so'; CREATE TABLE t1(a int) ENGINE=BLACKHOLE; diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 510c812a30f..ce382e35bd1 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN example SONAME 'ha_example'; INSTALL PLUGIN EXAMPLE SONAME 'ha_example'; -ERROR HY000: Function 'EXAMPLE' already exists +ERROR HY000: Plugin 'EXAMPLE' already installed UNINSTALL PLUGIN example; INSTALL SONAME 'ha_example'; select * from information_schema.plugins where plugin_library like 'ha_example%'; 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; diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/t/blackhole_plugin.test index 8af8fcc941c..0cc7ae0817c 100644 --- a/mysql-test/t/blackhole_plugin.test +++ b/mysql-test/t/blackhole_plugin.test @@ -7,7 +7,7 @@ DROP TABLE t1; --replace_regex /\.dll/.so/ eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO'; UNINSTALL PLUGIN blackhole; diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index 13e2c71fbc4..ec7117bb832 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -6,7 +6,7 @@ DROP TABLE t1; INSTALL PLUGIN example SONAME 'ha_example'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED INSTALL PLUGIN EXAMPLE SONAME 'ha_example'; UNINSTALL PLUGIN example; |