diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
| commit | 88b405c4e21162b73077e000a9b8f7ffe9d6d251 (patch) | |
| tree | cfcd7ea8160cf2c79be8d73ccca32445e830770a /Docs/Makefile.am | |
| parent | 84f81dc593e8e21cbfb4596aef375d45e3a26ba8 (diff) | |
| parent | 72455300841e1b00c312c3a03ace3bcbd57a4d2f (diff) | |
| download | mariadb-git-88b405c4e21162b73077e000a9b8f7ffe9d6d251.tar.gz | |
Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
Makefile.am:
Auto merged
ltconfig:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
sql/Makefile.am:
Auto merged
Docs/Makefile.am:
Merge with 3.23.56
Docs/manual.texi:
Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
Use local version
sql/log.cc:
Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
Use local version
Diffstat (limited to 'Docs/Makefile.am')
| -rw-r--r-- | Docs/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 80832719893..7d1d2ee8cbd 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \ all: $(targets) txt_files txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \ - INSTALL-BINARY # ../MIRRORS + INSTALL-BINARY CLEAN_FILES: $(BUILD_SOURCES) touch $(BUILD_SOURCES) @@ -254,8 +254,5 @@ INSTALL-BINARY: mysql.info $(GT) ../COPYING.LIB: mysql.info $(GT) perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@ -#../MIRRORS: manual.texi $(srcdir)/Support/generate-mirror-listing.pl -# perl -w $(srcdir)/Support/generate-mirror-listing.pl manual.texi > $@ - # Don't update the files from bitkeeper %::SCCS/s.% |