diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:39:36 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:39:36 +0200 |
| commit | d333c291bd42ddd987f012f10863b38f750f36c8 (patch) | |
| tree | c0961e5b22d075d29480c7331398eb5b6f61e23e /Makefile.am | |
| parent | 98eb9277c0a1458f5259193c78166052ecac7eac (diff) | |
| parent | 6b9492c25a57a117c14240d3ee047394a8a61939 (diff) | |
| download | mariadb-git-d333c291bd42ddd987f012f10863b38f750f36c8.tar.gz | |
Merge 5.1-build up into 5.4-build ("trunk-build").
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0435489456b..c1573fa6cd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. +# Copyright 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ @pstack_dir@ \ - @sql_union_dirs@ unittest storage plugin \ + @sql_union_dirs@ unittest \ @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench \ |