From 5dae19b394e3385c0e48d896fec1174437f2308a Mon Sep 17 00:00:00 2001
From: unknown <monty@donna.mysql.com>
Date: Sat, 18 Nov 2000 23:13:48 +0200
Subject: Fixed some reported bugs

BUILD/compile-alpha-cxx:
  Building on Alpha with Compaq C and C+++
Docs/manual.texi:
  Changelogs and update of links
myisam/mi_key.c:
  Fixed multi_part keys where first part where of TEXT/BLOB type
mysys/Makefile.am:
  Makefile.am now works with Compaq make
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/test-select.sh:
  Made the count_distinct_big test a bit smaller
sql/log.cc:
  Changed the slow log format to have more information by default
sql/mysqld.cc:
  false->FALSE
sql/share/german/errmsg.sys:
  Update of messages
sql/share/german/errmsg.txt:
  Update of messages
sql/sql_base.cc:
  Fixed SELECT DISTINCT *
sql/sql_insert.cc:
  Cleanup
sql/sql_table.cc:
  Added logging of DROP of temporary tables
vio/VioFd.cc:
  false -> FALSE
vio/VioSSL.cc:
  false -> FALSE
vio/VioSSLFactoriesFd.cc:
  false -> FALSE
vio/VioSocket.cc:
  false -> FALSE
---
 mysys/Makefile.am | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'mysys')

diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index d64f4959746..a53fc1a545c 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -61,7 +61,7 @@ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
                         @DEFS@
 
-#getopt1.o:		@THREAD_LOBJECTS@
+libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
 
 OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
 			__math.h time.h __time.h unistd.h __unistd.h types.h \
@@ -75,11 +75,25 @@ OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
 # I hope this always does the right thing. Otherwise this is only test programs
 FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
+#
+# The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
+# which automaticly removes the object files you use to compile a final program
+#
+
 test_thr_alarm: thr_alarm.c $(LIBRARIES)
-	$(LINK) $(FLAGS) -DMAIN $(srcdir)/thr_alarm.c $(LDADD) $(LIBS)
+	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
+	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
+	$(RM) ./test_thr_alarm.*
 
 test_thr_lock: thr_lock.c $(LIBRARIES)
-	$(LINK) $(FLAGS) -DMAIN $(srcdir)/thr_lock.c $(LDADD) $(LIBS)
+	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
+	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
+	$(RM) ./test_thr_lock.*
+
+test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
+	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
+	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
+	$(RM) test_vsnprintf.*
 
 test_dir: test_dir.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
@@ -87,9 +101,6 @@ test_dir: test_dir.c $(LIBRARIES)
 test_charset: test_charset.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
 
-test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
-	$(LINK) $(FLAGS) -DMAIN $(srcdir)/my_vsnprintf.c $(LDADD) $(LIBS)
-
 test_hash: test_hash.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
 
-- 
cgit v1.2.1