Merge rurik.mysql.com:/home/igor/mysql-5.0 (c3c232a8) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/Makefile.am

+19 −10

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl

		EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY

		all: txt_files

		txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
		TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
		INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

		all-local: $(TXT_FILES)

		# make sure that "make install" installs the info page, too
		# automake only seems to take care of this automatically,
		# if we're building the info page from texi directly.
		@@ -30,28 +30,37 @@ install-data-hook: mysql.info
		$(mkinstalldirs) $(DESTDIR)$(infodir)
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)

		CLEAN_FILES: $(txt_files)
		touch $(txt_files)
		uninstall-local:
		@RM@ -f $(DESTDIR)$(infodir)/mysql.info

		# Problems with "make distclean", works differently for make files
		# generated by different versions of the automake. Some require the
		# generated files explicitly in DISTCLEANFILES.
		DISTCLEANFILES = $(TXT_FILES)

		# This target is not used in builds, just for convinience
		CLEAN_FILES: $(TXT_FILES)
		touch $(TXT_FILES)

		GT = $(srcdir)/Support/generate-text-files.pl

		../INSTALL-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
		perl -w $(GT) $< "installing-source" "windows-source-build" > $@

		../INSTALL-WIN-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
		perl -w $(GT) $< "windows-source-build" "post-installation" > $@

		# 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" > $@
		perl -w $(GT) $< "installing-binary" "installing-source" > $@

		../EXCEPTIONS-CLIENT: mysql.info $(GT)
		perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
		perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@

		../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
		perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
		perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@

		# Don't update the files from bitkeeper
		%::SCCS/s.%

Makefile.am

+15 −16

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		AUTOMAKE_OPTIONS = foreign

		# These are built from source in the Docs directory
		EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
		EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
		README COPYING EXCEPTIONS-CLIENT
		SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
		@readline_topdir@ sql-common \
		@thread_dirs@ pstack \
		@@ -34,16 +35,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
		BUILD netware os2 @libmysqld_dirs@ \
		@bench_dirs@ support-files @tools_dirs@

		# Relink after clean
		linked_sources = linked_client_sources linked_server_sources \
		linked_libmysql_sources linked_libmysql_r_sources \
		linked_libmysqld_sources linked_libmysqldex_sources \
		# Run these targets before any others, also make part of clean target,
		# to make sure we create new links after a clean.
		BUILT_SOURCES = linked_client_sources linked_server_sources \
		@linked_client_targets@ \
		@linked_libmysqld_targets@ \
		linked_include_sources @linked_netware_sources@

		CLEANFILES = $(linked_sources)

		# This is just so that the linking is done early.
		all-local: $(linked_sources)
		# The db.h file is a bit special, see note in "configure.in".
		# In the case we didn't compile with bdb, a dummy file is put
		# there, but will not be removed by the bdb make file becuase
		# it will never be called.
		CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
		DISTCLEANFILES = ac_available_languages_fragment

		linked_include_sources:
		cd include; $(MAKE) link_sources
		@@ -73,13 +77,8 @@ linked_netware_sources:
		cd @netware_dir@; $(MAKE) link_sources
		echo timestamp > linked_netware_sources

		#avoid recursive make calls in sql directory
		linked_server_sources:
		cd sql; rm -f mini_client_errors.c;\
		@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
		rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
		rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
		rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
		cd sql; $(MAKE) link_sources
		echo timestamp > linked_server_sources

		# Create permission databases
		@@ -91,7 +90,7 @@ bin-dist: all

		# Remove BK's "SCCS" subdirectories from source distribution
		dist-hook:
		rm -rf `find $(distdir) -type d -name SCCS`
		rm -rf `find $(distdir) -type d -name SCCS -print`

		tags:
		support-files/build-tags

client/Makefile.am

+3 −3

Original line number	Diff line number	Diff line
		@@ -56,12 +56,12 @@ DEFS = -DUNDEF_THREADS_HACK

		link_sources:
		for f in $(sql_src) ; do \
		rm -f $(srcdir)/$$f; \
		@LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
		rm -f $$f; \
		@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
		done; \
		for f in $(strings_src) ; do \
		rm -f $(srcdir)/$$f; \
		@LN_CP_F@ $(top_srcdir)/strings/$$f $(srcdir)/$$f; \
		@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
		done;

		# Don't update the files from bitkeeper

client/mysql.cc

+8 −4

Original line number	Diff line number	Diff line
		@@ -527,7 +527,7 @@ static struct my_option my_long_options[] =
		{"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
		0, 0, 0, 0, 0},
		#ifdef __NETWARE__
		{"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
		{"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
		0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
		#endif
		{"auto-rehash", OPT_AUTO_REHASH,
		@@ -1872,9 +1872,13 @@ com_help(String *buffer __attribute__((unused)),
		if (help_arg)
		return com_server_help(buffer,line,help_arg+1);

		put_info("\nFor the complete MySQL Manual online, visit:\n http://www.mysql.com/documentation\n", INFO_INFO);
		put_info("For info on technical support from MySQL developers, visit:\n http://www.mysql.com/support\n", INFO_INFO);
		put_info("For info on MySQL books, utilities, consultants, etc., visit:\n http://www.mysql.com/portal\n", INFO_INFO);
		put_info("\nFor information about MySQL products and services, visit:\n"
		" http://www.mysql.com/\n"
		"For developer information, including the MySQL Reference Manual, "
		"visit:\n"
		" http://dev.mysql.com/\n"
		"To buy MySQL Network Support, training, or other products, visit:\n"
		" https://shop.mysql.com/\n", INFO_INFO);
		put_info("List of all MySQL commands:", INFO_INFO);
		if (!named_cmds)
		put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);

client/mysqladmin.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ static TYPELIB command_typelib=
		static struct my_option my_long_options[] =
		{
		#ifdef __NETWARE__
		{"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
		{"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
		0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
		#endif
		{"count", 'c',