diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
| commit | b0efe477fbec37c273098bc85263b195544f2edc (patch) | |
| tree | c54f50741a391458499e36ae02a2103f5717f07e /sql/ha_myisammrg.cc | |
| parent | fb2c04a15f6bb4a837e312019e18f881d43bbdd8 (diff) | |
| parent | fa15fbf34738550527b6b102960b7d9750fd959d (diff) | |
| download | mariadb-git-b0efe477fbec37c273098bc85263b195544f2edc.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1
into xiphis.org:/home/antony/work2/wl3201-post-review.2
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 0ce4e1d8bcb..8130a5d939a 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -28,6 +28,8 @@ #include "../storage/myisammrg/myrg_def.h" #endif +#include <mysql/plugin.h> + /***************************************************************************** ** MyISAM MERGE tables *****************************************************************************/ @@ -573,3 +575,16 @@ bool ha_myisammrg::check_if_incompatible_data(HA_CREATE_INFO *info, */ return COMPATIBLE_DATA_NO; } + +mysql_declare_plugin(myisammrg) +{ + MYSQL_STORAGE_ENGINE_PLUGIN, + &myisammrg_hton, + myisammrg_hton.name, + "MySQL AB", + "MyISAMMRG Storage Engine", + NULL, /* Plugin Init */ + NULL, /* Plugin Deinit */ + 0x0100 /* 1.0 */, +} +mysql_declare_plugin_end; |