diff options
author | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
---|---|---|
committer | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
commit | c71aae73f6f864c97cf17b3e872346666b871c3f (patch) | |
tree | 4895816aee1a0fcef08daa0f68bf1b1fe9aa2b5a /plugin | |
parent | 3c59ba32ab9cca29e01bd8dd2130af83ead8bde0 (diff) | |
parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
download | mariadb-git-c71aae73f6f864c97cf17b3e872346666b871c3f.tar.gz |
merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 22f6bfd88b2..68f1f939836 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = fulltext/configure.in SUBDIRS = @mysql_pg_dirs@ -DIST_SUBDIRS = daemon_example fulltext +DIST_SUBDIRS = @mysql_pg_distdirs@ # Don't update the files from bitkeeper %::SCCS/s.% |