Commit 33a2716a authored by unknown's avatar unknown
Browse files

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
libmysqld/Makefile.am:
  Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
  Merged from 5.0 to 5.1.
sql/lex.h:
  Merged from 5.0 to 5.1.
sql/set_var.cc:
  Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
  Merged from 5.0 to 5.1.
sql/sql_lex.h:
  Merged from 5.0 to 5.1.
sql/sql_show.cc:
  Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
  Merged from 5.0 to 5.1.
parents 817ee181 056d7266

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 \
@@ -37,16 +38,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			BUILD netware os2 @libmysqld_dirs@\

			@bench_dirs@ support-files server-tools tools



# 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
@@ -76,13 +80,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
@@ -94,7 +93,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

+1 −1
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,

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',