diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
| commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
| tree | a4d45b1fd0e434c23577507364fa443226676eb5 /mysql-test/suite/archive | |
| parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz | |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
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; |