diff options
author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-05 12:07:41 +0200 |
---|---|---|
committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-05 12:07:41 +0200 |
commit | 7fa1449eac29401b3d1f3fb4980149e9e562a705 (patch) | |
tree | 1999ea4dad1da7b6e45b45e80311ccaf86771abb /storage | |
parent | 7c691a2e3fa8ac7ee654b028c44d1389abc04e8c (diff) | |
download | mariadb-git-7fa1449eac29401b3d1f3fb4980149e9e562a705.tar.gz |
InnoDB plugin is built-in: remove test code which depended on the plugin property
mysql-test/lib/mtr_cases.pm:
there is only one InnoDB in this tree, no need to run an InnoDB test twice
mysql-test/suite/innodb/include/have_innodb_plugin.inc:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb-analyze.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb-timeout.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb-use-sys-malloc.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb-zip.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb_bug36169.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb_bug36172.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb_file_format.test:
plugin is now the builtin
mysql-test/suite/innodb/t/innodb_information_schema.test:
plugin is now the builtin
storage/innodb_plugin/plug.in:
build libinnobase.a, to have it built-in
Diffstat (limited to 'storage')
-rw-r--r-- | storage/innodb_plugin/plug.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in index 6daa6c5daed..52ad86179a4 100644 --- a/storage/innodb_plugin/plug.in +++ b/storage/innodb_plugin/plug.in @@ -17,6 +17,7 @@ MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine], [Transactional Tables using InnoDB], [max,max-no-ndb]) MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin]) +MYSQL_PLUGIN_STATIC(innodb_plugin, [libinnobase.a]) MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la]) MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ AC_CHECK_HEADERS(sched.h) |