mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
034b44cb9f
BitKeeper/etc/logging_ok: auto-union scripts/make_win_src_distribution.old: Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old BUILD/compile-pentium-debug-max: Auto merged BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86: Auto merged BitKeeper/deleted/.del-sel000001.test~9567c1646058cc: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged Docs/Makefile.am: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged extra/perror.c: Auto merged include/config-win.h: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/log0recv.h: Auto merged innobase/include/row0sel.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_extra.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_queue.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/flush.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/grant_cache.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rpl000018.result: Auto merged mysql-test/r/rpl_insert_id.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/rpl_relayspace.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/alias.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/fulltext_left_join.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000018.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/sel000100.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/default.c: Auto merged mysys/mf_format.c: Auto merged mysys/my_getopt.c: Auto merged mysys/thr_lock.c: Auto merged mysys/tree.c: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/Makefile.am: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/nt_servc.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/uniques.cc: Auto merged support-files/mysql.spec.sh: Auto merged vio/viosocket.c: Auto merged BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: merge BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: merge acinclude.m4: Merge with 4.0 (openssl patch) client/mysqlbinlog.cc: Merge with 4.0 in which we had added code from 4.1 (We are basicly only using the 4.1 code here) configure.in: Keep 4.1 file heap/hp_open.c: merge with 4.0 include/my_base.h: merge with 4.0 include/my_global.h: merge with 4.0 include/mysqld_error.h: merge with 4.0 innobase/ha/ha0ha.c: merge with 4.0 (Code should be same but we use indentaion from 4.0) innobase/log/log0recv.c: merge with 4.0 libmysql/libmysql.c: Remove with 4.0 code that was ported from 4.1 libmysqld/lib_sql.cc: merge with 4.0 myisam/mi_open.c: Remove 4.0 specific code myisam/myisamchk.c: merge with 4.0 myisammrg/myrg_rkey.c: merge with 4.0 mysql-test/r/alter_table.result: May need to be fixed after merge mysql-test/r/create.result: May need to be fixed after merge mysql-test/r/distinct.result: May need to be fixed after merge mysql-test/r/drop.result: May need to be fixed after merge mysql-test/r/fulltext.result: May need to be fixed after merge mysql-test/r/func_set.result: May need to be fixed after merge mysql-test/r/func_str.result: May need to be fixed after merge mysql-test/r/func_test.result: May need to be fixed after merge mysql-test/r/grant.result: May need to be fixed after merge mysql-test/r/group_by.result: May need to be fixed after merge mysql-test/r/handler.result: May need to be fixed after merge mysql-test/r/heap.result: May need to be fixed after merge mysql-test/r/innodb.result: May need to be fixed after merge mysql-test/r/insert.result: May need to be fixed after merge mysql-test/r/insert_select.result: May need to be fixed after merge mysql-test/r/key_diff.result: May need to be fixed after merge mysql-test/r/merge.result: May need to be fixed after merge mysql-test/r/myisam.result: May need to be fixed after merge mysql-test/r/order_by.result: May need to be fixed after merge mysql-test/r/query_cache.result: May need to be fixed after merge mysql-test/r/rpl_flush_log_loop.result: May need to be fixed after merge mysql-test/r/rpl_loaddata.result: May need to be fixed after merge mysql-test/r/rpl_log.result: May need to be fixed after merge mysql-test/r/rpl_log_pos.result: May need to be fixed after merge mysql-test/r/rpl_rotate_logs.result: May need to be fixed after merge mysql-test/r/select.result: May need to be fixed after merge mysql-test/r/union.result: May need to be fixed after merge mysql-test/r/user_var.result: May need to be fixed after merge mysql-test/t/alter_table.test: merge with 4.0 mysql-test/t/create.test: merge with 4.0 mysql-test/t/distinct.test: merge with 4.0 mysql-test/t/drop.test: merge with 4.0 mysql-test/t/flush.test: merge with 4.0 mysql-test/t/fulltext.test: merge with 4.0 mysql-test/t/func_set.test: merge with 4.0 mysql-test/t/func_str.test: merge with 4.0 mysql-test/t/func_test.test: merge with 4.0 mysql-test/t/grant.test: merge with 4.0 mysql-test/t/grant_cache.test: merge with 4.0 mysql-test/t/innodb.test: Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB mysql-test/t/insert.test: merge with 4.0 mysql-test/t/insert_select.test: merge with 4.0 mysql-test/t/merge.test: merge with 4.0 mysql-test/t/query_cache.test: merge with 4.0 mysql-test/t/rpl_flush_log_loop.test: merge with 4.0 mysql-test/t/rpl_loaddata.test: merge with 4.0 mysql-test/t/rpl_rotate_logs.test: merge with 4.0 mysql-test/t/select.test: merge with 4.0 mysql-test/t/symlink.test: merge with 4.0 mysql-test/t/union.test: merge with 4.0 mysys/charset.c: merge with 4.0 scripts/mysql_fix_privilege_tables.sh: merge with 4.0 (Add quoting for some variables) sql/field.h: merge with 4.0 sql/ha_innodb.cc: merge with 4.0 sql/item_cmpfunc.cc: merge with 4.0 sql/item_cmpfunc.h: merge with 4.0 sql/item_func.h: merge with 4.0 sql/item_strfunc.cc: merge with 4.0 Fixed null handling with ELT() sql/item_timefunc.h: merge with 4.0 sql/lex.h: merge with 4.0 sql/log.cc: merge with 4.0 sql/log_event.cc: Merge with 4.0 Cleanups: - Indentation - #endif comments - Replace strmov() with *pos++= for two byte strings - Moved variable declarations to start of functions - Merged identical code (LOAD_EVENT) - Added casts when subtracting pointers Did a full diff between this and 4.0 to ensure that the file is correct after merge. sql/log_event.h: merge with 4.0 sql/mysql_priv.h: merge with 4.0 sql/mysqld.cc: merge with 4.0 sql/repl_failsafe.cc: merge with 4.0 sql/set_var.cc: merge with 4.0 sql/set_var.h: merge with 4.0 sql/share/czech/errmsg.txt: merge with 4.0 sql/share/danish/errmsg.txt: merge with 4.0 sql/share/dutch/errmsg.txt: merge with 4.0 sql/share/english/errmsg.txt: merge with 4.0 sql/share/estonian/errmsg.txt: merge with 4.0 sql/share/french/errmsg.txt: merge with 4.0 sql/share/german/errmsg.txt: merge with 4.0 sql/share/greek/errmsg.txt: merge with 4.0 sql/share/hungarian/errmsg.txt: merge with 4.0 sql/share/italian/errmsg.txt: merge with 4.0 sql/share/japanese/errmsg.txt: merge with 4.0 sql/share/korean/errmsg.txt: merge with 4.0 sql/share/norwegian-ny/errmsg.txt: merge with 4.0 sql/share/norwegian/errmsg.txt: merge with 4.0 sql/share/polish/errmsg.txt: merge with 4.0 sql/share/portuguese/errmsg.txt: merge with 4.0 sql/share/romanian/errmsg.txt: merge with 4.0 sql/share/russian/errmsg.txt: merge with 4.0 sql/share/slovak/errmsg.txt: merge with 4.0 sql/share/spanish/errmsg.txt: merge with 4.0 sql/share/swedish/errmsg.txt: merge with 4.0 sql/share/ukrainian/errmsg.txt: merge with 4.0 sql/slave.cc: Merge + some indentation fixes sql/slave.h: merge with 4.0 sql/sql_acl.cc: merge with 4.0 Some end space removal to make it easier to do future merges sql/sql_acl.h: merge with 4.0 sql/sql_cache.cc: merge with 4.0 sql/sql_class.h: merge with 4.0 sql/sql_handler.cc: merge with 4.0 sql/sql_lex.cc: merge with 4.0 sql/sql_lex.h: merge with 4.0 sql/sql_parse.cc: merge with 4.0 sql/sql_repl.cc: merge with 4.0 sql/sql_select.cc: merge with 4.0 sql/sql_table.cc: merge with 4.0 sql/sql_union.cc: Merge with 4.0 Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later sql/sql_yacc.yy: merge with 4.0 Removed end space to make merge easier vio/Makefile.am: merge with 4.0
213 lines
6.5 KiB
Makefile
213 lines
6.5 KiB
Makefile
# Normally you do not need to remake the files here. But if you want
|
|
# to you will need the GNU TeX-info utilities. To make a Postscript
|
|
# files you also need TeX and dvips. To make the PDF file you will
|
|
# need pdftex. We use the teTeX distribution for all of these.
|
|
|
|
# We avoid default automake rules because of problems with .dvi file
|
|
# and BSD makes
|
|
|
|
# If you know how to fix any of this more elegantly please mail
|
|
# docs@mysql.com
|
|
|
|
TEXI2HTML_FLAGS = -iso -number
|
|
DVIPS = dvips
|
|
MAKEINFO = @MAKEINFO@
|
|
TEXINFO_TEX = Support/texinfo.tex
|
|
|
|
noinst_SCRIPTS = Support/texi2html Support/generate-text-files.pl \
|
|
Support/generate-mirror-listing.pl
|
|
info_TEXINFOS = manual.texi
|
|
|
|
targets = manual.txt mysql.info manual.html
|
|
|
|
BUILT_SOURCES = $(targets) manual_toc.html include.texi
|
|
EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
|
|
INSTALL-BINARY reservedwords.texi
|
|
|
|
all: $(targets) txt_files
|
|
|
|
txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
|
|
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
|
|
|
|
CLEAN_FILES: $(BUILD_SOURCES)
|
|
touch $(BUILD_SOURCES)
|
|
|
|
# The PostScript and PDF version are so big that they are not included in the
|
|
# standard distribution. It is available for download from the home page.
|
|
paper: manual_a4.ps manual_letter.ps $(PDFMANUAL)
|
|
|
|
#########################################################################
|
|
|
|
# The Makefile contains the previous version so we can not use that
|
|
include.texi: ../configure.in
|
|
echo "@c This file is autogenerated by the Makefile" > $@
|
|
echo -n "@set mysqlversion " >> $@
|
|
grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
|
|
sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@
|
|
echo -n "@set defaultport " >> $@
|
|
grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
|
|
sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@
|
|
|
|
|
|
#
|
|
# English Manual
|
|
#
|
|
|
|
# GNU Info
|
|
mysql.info: manual.texi include.texi
|
|
cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
|
|
|
|
# Plain Text
|
|
manual.txt: manual.texi include.texi
|
|
cd $(srcdir) && \
|
|
$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
|
|
|
|
# HTML, all in one file
|
|
manual.html: manual.texi include.texi $(srcdir)/Support/texi2html
|
|
cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
|
|
manual_toc.html: manual.html
|
|
|
|
# PDF, Portable Document Format
|
|
manual.pdf: manual.texi
|
|
sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
mv manual-tmp.pdf $@
|
|
rm -f manual-tmp.*
|
|
touch $@
|
|
|
|
# XML, DocBook 4.0
|
|
mysql.xml: manual.texi include.texi
|
|
$(MAKEINFO) --force --no-ifinfo --docbook $<
|
|
mv $@ mysql-tmp.xml
|
|
Support/docbook-fixup.pl <mysql-tmp.xml >$@
|
|
rm -f mysql-tmp.xml
|
|
|
|
# Postscript, A4 Paper
|
|
manual_a4.ps: manual.texi include.texi
|
|
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
|
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
|
|
$(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
|
|
$(DVIPS) -t a4 manual.dvi -o $@
|
|
touch $@
|
|
|
|
# Postscript, US Letter Paper
|
|
manual_letter.ps: manual.texi include.texi
|
|
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
|
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
|
|
$(TEXI2DVI) --batch $<
|
|
$(DVIPS) -t letter manual.dvi -o $@
|
|
touch $@
|
|
|
|
|
|
#
|
|
# German Manual
|
|
#
|
|
|
|
# GNU Info
|
|
mysql.de.info: manual.de.texi include.texi
|
|
cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
|
|
|
|
# Plain Text
|
|
manual.de.txt: manual.de.texi include.texi
|
|
cd $(srcdir) && \
|
|
$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
|
|
|
|
# HTML, all in one file
|
|
manual.de.html: manual.de.texi include.texi $(srcdir)/Support/texi2html
|
|
cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
|
|
manual_toc.de.html: manual.html
|
|
|
|
# PDF, Portable Document Format
|
|
manual.de.pdf: manual.de.texi
|
|
sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
mv manual-tmp.pdf $@
|
|
rm -f manual-tmp.*
|
|
touch $@
|
|
|
|
# XML, DocBook 4.0
|
|
mysql.de.xml: manual.de.texi include.texi
|
|
$(MAKEINFO) --force --no-ifinfo --docbook $<
|
|
mv $@ mysql-tmp.xml
|
|
Support/docbook-fixup.pl <mysql-tmp.xml >$@
|
|
rm -f mysql-tmp.xml
|
|
|
|
# Postscript, A4 Paper
|
|
manual_a4.de.ps: manual.de.texi include.texi
|
|
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
|
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
|
|
$(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
|
|
$(DVIPS) -t a4 manual.de.dvi -o $@
|
|
touch $@
|
|
|
|
# Postscript, US Letter Paper
|
|
manual_letter.de.ps: manual.de.texi include.texi
|
|
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
|
MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
|
|
$(TEXI2DVI) --batch $<
|
|
$(DVIPS) -t letter manual.de.dvi -o $@
|
|
touch $@
|
|
|
|
#
|
|
# Miscellaneous
|
|
#
|
|
|
|
# Target to produce NuSphere Manual
|
|
nusphere.pdf: manual.texi
|
|
sed -e 's/@example/@smallexample/g' \
|
|
-e 's/@end example/@end smallexample/g' \
|
|
-e 's/@c ifnusphere //g' \
|
|
-e 's|@image{[^}]*} *||g' \
|
|
<$< >manual-tmp.texi
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
texindex manual-tmp.??
|
|
pdftex --interaction=nonstopmode manual-tmp.texi
|
|
mv manual-tmp.pdf $@
|
|
rm -f manual-tmp.*
|
|
touch $@
|
|
|
|
# Include images for the manual in the distribution
|
|
dist-hook:
|
|
BD=`cd $(top_srcdir); pwd`; \
|
|
if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \
|
|
$(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \
|
|
$(srcdir)/Flags/*.txt $(distdir)/Flags;
|
|
echo "PostScript and PDF versions suitable for printing" \
|
|
> $(distdir)/manual.ps
|
|
echo "are available from http://www.mysql.com/Manual/" \
|
|
>> $(distdir)/manual.ps
|
|
echo "or any mirror site" \
|
|
>> $(distdir)/manual.ps
|
|
|
|
GT = $(srcdir)/Support/generate-text-files.pl
|
|
|
|
../INSTALL-SOURCE: mysql.info $(GT)
|
|
perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
|
|
|
|
# We put the description for the binary installation here so that
|
|
# people who download source wont have to see it. It is moved up to
|
|
# the toplevel by the script that makes the binary tar files.
|
|
INSTALL-BINARY: mysql.info $(GT)
|
|
perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
|
|
|
|
../COPYING: mysql.info $(GT)
|
|
perl -w $(GT) mysql.info "GPL license" "LGPL license" > $@
|
|
|
|
../COPYING.LIB: mysql.info $(GT)
|
|
perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
|
|
|
|
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
|
|
perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|