diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/t/archive_plugin.test | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/t/archive_plugin.test')
| -rw-r--r-- | mysql-test/t/archive_plugin.test | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/mysql-test/t/archive_plugin.test b/mysql-test/t/archive_plugin.test index 7d9b0ea065f..b1126ab0c87 100644 --- a/mysql-test/t/archive_plugin.test +++ b/mysql-test/t/archive_plugin.test @@ -1,20 +1,17 @@ ---source include/not_windows.inc ---source include/have_archive_plugin.inc - -# When running in parallel we get -# Warning 1620 Plugin is busy and will be uninstalled on shutdown ---source include/not_parallel.inc +if (!$HA_ARCHIVE_SO) { + --skip Need example plugin +} CREATE TABLE t1(a int) ENGINE=ARCHIVE; DROP TABLE t1; -INSTALL PLUGIN archive SONAME 'ha_archive.so'; +eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; --error 1125 -INSTALL PLUGIN ARCHIVE SONAME 'ha_archive.so'; +eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; UNINSTALL PLUGIN archive; -INSTALL PLUGIN archive SONAME 'ha_archive.so'; +eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; CREATE TABLE t1(a int) ENGINE=ARCHIVE; |