Commit a99c1757 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql

parents b2ead615 ac93ec4a

Docs/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ all: $(targets) txt_files 
txt_files:		../INSTALL-SOURCE ../COPYING ../COPYING.LIB \

			../MIRRORS INSTALL-BINARY



CLEAN_FILES:		manual.ps



# The PostScript version is so big that is not included in the

# standard distribution. It is available for download from the home page.  

paper: manual_a4.ps manual_letter.ps

Docs/manual.texi

+0 −2
Original line number Diff line number Diff line
@@ -5754,8 +5754,6 @@ shell> CC=gcc CFLAGS="-O6" \ 
If you have the Sun Workshop 4.2 compiler, you can run @code{configure} like

this:













CC=cc CFLAGS="-xstrconst -Xa -xO4 -native -mt" CXX=CC CXXFLAGS="-xO4 -native -noex -mt" ./configure --prefix=/usr/local/mysql



























@example















shell> CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt" \















       CXX=CC CXXFLAGS="-noex -XO4 -mt" \

























Makefile.am



+6
−2






























Original line number
Diff line number
Diff line








@@ -27,10 +27,14 @@ SUBDIRS =		include @docs_dirs@ @readline_dir@ \













			@bench_dirs@ support-files































# Relink after clean













CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources













CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources































# This is just so that the linking is done early.













config.h:	linked_client_sources linked_server_sources













config.h:	linked_include_sources linked_client_sources linked_server_sources



























linked_include_sources:













	cd include; $(MAKE) link_sources













	echo timestamp > linked_include_sources































linked_client_sources:  @linked_client_targets@















	echo timestamp > linked_client_sources

































include/Makefile.am



+7
−5






























Original line number
Diff line number
Diff line








@@ -15,11 +15,11 @@













# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,















# MA 02111-1307, USA





























BUILT_SOURCES =		my_config.h mysql_version.h m_ctype.h













BUILT_SOURCES =		mysql_version.h m_ctype.h















pkginclude_HEADERS =	dbug.h m_string.h my_sys.h mysql.h mysql_com.h \















			mysqld_error.h my_list.h \















		        my_pthread.h my_no_pthread.h raid.h errmsg.h \













			my_config.h my_global.h my_net.h \













			my_global.h my_net.h \















			sslopt-case.h sslopt-longopts.h sslopt-usage.h \















			sslopt-vars.h $(BUILT_SOURCES)















noinst_HEADERS =	global.h config-win.h \









@@ -30,17 +30,19 @@ noinst_HEADERS =	global.h config-win.h \













			my_tree.h hash.h thr_alarm.h thr_lock.h \















			getopt.h t_ctype.h violite.h \















			mysql_version.h.in













EXTRA_DIST=		my_config.h































# mysql_version.h are generated













SUPERCLEANFILES =	mysql_version.h













SUPERCLEANFILES =	mysql_version.h my_global.h































# Some include files that may be moved and patched by configure















DISTCLEANFILES =	sched.h













CLEANFILES =		my_config.h





























all-local:	my_config.h my_global.h













all-local:		my_global.h































# Since we include my_config.h it better exist from the beginning













my_config.h:  ../config.h













link_sources:















	$(CP) ../config.h my_config.h































# This should be changed in the source and removed.

































libmysql/Makefile.shared



+1
−1






























Original line number
Diff line number
Diff line








@@ -75,7 +75,7 @@ clean-local:













	rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \















	      `echo $(dbugobjects) | sed "s;\.lo;.c;g"` \















	      `echo $(mysysobjects) | sed "s;\.lo;.c;g"` \













	       $(mystringsextra) ctype_extra_sources.c \













	       $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \















	       ../linked_client_sources































ctype_extra_sources.c: conf_to_src