diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
| commit | 210a412522b10115d34b431c66acf403faab7bfe (patch) | |
| tree | 56c09cfd1053265897d114e4acb52d395185f27e /storage/Makefile.am | |
| parent | 059b9356a19118a48fbad31be81c4859e15d3bc8 (diff) | |
| parent | 4aeeb1d157a67c5359475d8941267641fb894b22 (diff) | |
| download | mariadb-git-210a412522b10115d34b431c66acf403faab7bfe.tar.gz | |
bzr merge from guilhem's maria tree to our local 5.1
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
Diffstat (limited to 'storage/Makefile.am')
| -rw-r--r-- | storage/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/Makefile.am b/storage/Makefile.am index b978453d29d..4f19be3a361 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = SUBDIRS = @mysql_se_dirs@ +DIST_SUBDIRS = @mysql_se_distdirs@ # Don't update the files from bitkeeper %::SCCS/s.% |