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

This commit is contained in:
monty@donna.mysql.com 2000-09-14 15:41:20 +03:00
commit a99c1757be
19 changed files with 23 additions and 12 deletions

View File

@ -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

View File

@ -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" \

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -53,12 +53,14 @@ pkgdata_DATA = make_binary_distribution
CLEANFILES = @server_scripts@ \
make_binary_distribution \
msql2mysql \
mysql_config \
mysql_fix_privilege_tables \
mysql_setpermission \
mysql_zap \
mysqlaccess \
mysql_convert_table_format \
mysql_find_rows
mysql_find_rows \
mysqlhotcopy
SUPERCLEANFILES = mysqlbug

0
scripts/make_binary_distribution.sh Executable file → Normal file
View File

0
scripts/mysql_convert_table_format.sh Executable file → Normal file
View File

0
scripts/mysql_find_rows.sh Executable file → Normal file
View File

0
scripts/mysql_setpermission.sh Executable file → Normal file
View File

0
scripts/mysql_zap.sh Executable file → Normal file
View File

0
scripts/mysqlaccess.conf Executable file → Normal file
View File

0
scripts/mysqlaccess.sh Executable file → Normal file
View File

0
scripts/mysqlbug.sh Executable file → Normal file
View File

0
scripts/mysqlhotcopy.sh Executable file → Normal file
View File

0
scripts/safe_mysqld-watch.sh Executable file → Normal file
View File

0
scripts/safe_mysqld.sh Executable file → Normal file
View File

View File

@ -41,7 +41,10 @@ CLEANFILES = my-small.cnf \
my-huge.cnf \
mysql.spec \
mysql-@VERSION@.spec \
mysql.server
mysql-log-rotate \
mysql.server \
binary-configure
mysql-@VERSION@.spec: mysql.spec
rm -f $@

0
support-files/binary-configure.sh Executable file → Normal file
View File