diff options
| author | unknown <monty@mysql.com> | 2004-11-12 11:17:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-12 11:17:53 +0200 |
| commit | 44070705ea958c57faa486e7f22ca5fb1ada095c (patch) | |
| tree | 59f4a8722fd9657366da60b4af149031105872ab /Docs/Makefile.am | |
| parent | 6a1bc4a52a8446775dbb428c2701d903b7902ad3 (diff) | |
| parent | b19eb67f08d04de3af744097e72023d550329035 (diff) | |
| download | mariadb-git-44070705ea958c57faa486e7f22ca5fb1ada095c.tar.gz | |
merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
Auto merged
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/default.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log.cc:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqldump.c:
merge with 4.0
(This only reorders options)
sql/ha_innodb.cc:
merge with 4.0 (Keep original code)
sql/time.cc:
Note that part of this patch is done in my_time.c
Diffstat (limited to 'Docs/Makefile.am')
| -rw-r--r-- | Docs/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 034cec3b133..26a665e2fea 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -24,6 +24,8 @@ BUILT_SOURCES = $(targets) manual_toc.html include.texi EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \ INSTALL-BINARY reservedwords.texi internals.texi +SUBDIRS = Images + all: $(targets) txt_files txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ |