diff options
| author | unknown <joerg@trift2.> | 2006-11-01 13:26:03 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-11-01 13:26:03 +0100 |
| commit | a1db0e72de8805fe0652c7142be5ec59cd659c67 (patch) | |
| tree | d892b80d02ea4fde1d578793a28d89757ed13b4a /storage/myisammrg | |
| parent | 40a3f6f72e5eae25c6fc86d667d0a21f643f8005 (diff) | |
| parent | c35715392f01b34865a5cbbdbfa89efb58814482 (diff) | |
| download | mariadb-git-a1db0e72de8805fe0652c7142be5ec59cd659c67.tar.gz | |
Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/plug.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/myisammrg/plug.in b/storage/myisammrg/plug.in index b4b2af8d984..1f94e07d881 100644 --- a/storage/myisammrg/plug.in +++ b/storage/myisammrg/plug.in @@ -3,3 +3,4 @@ MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine], MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg]) MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg.a]) MYSQL_PLUGIN_MANDATORY(myisammrg) +MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc]) |