diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-06-10 22:50:00 +0500 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-06-10 22:50:00 +0500 |
| commit | 4adad43f75be353381881c7a5bb66a76e79f5db8 (patch) | |
| tree | c95e685cc955eca98500121f078ee41bddddf5a9 | |
| parent | 8ff151e6559d0dfdc6d10dffdbba3504052cd009 (diff) | |
| download | mariadb-git-4adad43f75be353381881c7a5bb66a76e79f5db8.tar.gz | |
Removed legacy name for innodb_plugin SE, so --with[out]-innodb
option doesn't affect innodb_plugin.
Currently it works as following:
* configure without relevant options producing two dynamic plugins
* configure --with-plugin-innodb (or legacy --with-innodb) producing
static standard InnoDB
* configure --without-plugin-innodb (or legacy --without-innodb)
disabling standard InnoDB
* configure --with-plugin-innodb_plugin producing dynamic innodb_plugin
* configure --without-plugin-innodb_plugin disabling innodb_plugin
| -rw-r--r-- | .bzr-mysql/default.conf | 4 | ||||
| -rw-r--r-- | storage/innodb_plugin/plug.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index d777160cf3e..53d13766e34 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] -post_commit_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com" -post_push_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com" +post_commit_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com,Tomas.Ulin@Sun.COM,wlad@sun.com" +post_push_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com,Tomas.Ulin@Sun.COM,wlad@sun.com" tree_name = "mysql-5.1-innodb_plugin" diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in index b1f5b92c010..d709b9bc4a9 100644 --- a/storage/innodb_plugin/plug.in +++ b/storage/innodb_plugin/plug.in @@ -14,7 +14,7 @@ # Place, Suite 330, Boston, MA 02111-1307 USA # -MYSQL_STORAGE_ENGINE(innodb_plugin, innodb, [InnoDB Storage Engine], +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(innobase, [libinnobase.a]) |