Commit c0ed2528 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

- Applied various patches provided by Christian Hammers (MySQL maintainer 

   for the Debian project) to fix some architecture-specific problems
   and some bugs
parent 446b9c07

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ AUTOMAKE_OPTIONS = foreign 
# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

SUBDIRS =		include @docs_dirs@ @readline_dir@ \

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

			@bench_dirs@ support-files os2

			@bench_dirs@ support-files os2 libmysql_r



# Relink after clean

CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

bdb/dist/aclocal/mutex.m4

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ fi 
dnl Sparc/gcc: SunOS, Solaris

dnl The sparc/gcc code doesn't always work, specifically, I've seen assembler

dnl failures from the stbar instruction on SunOS 4.1.4/sun4c and gcc 2.7.2.2.

if test "$db_cv_mutex" = DOESNT_WORK; then

if test "$db_cv_mutex" = no; then

AC_TRY_RUN([main(){

#if defined(__sparc__)

#if defined(__GNUC__)

bdb/include/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ typedef unsigned char tsl_t; 
 */

#define	MUTEX_SET(tsl) ({						\

	register tsl_t *__l = (tsl);					\

	int __r;							\

	unsigned char __r;						\

	    asm volatile("tas  %1; \n					\

			  seq  %0"					\

		: "=dm" (__r), "=m" (*__l)				\

ltconfig

+10 −0
Original line number Diff line number Diff line
@@ -3009,6 +3009,16 @@ hardcode_action=$hardcode_action 
# This must work even if \$libdir does not exist.

hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec



# Check if debuild is being run by the current shell.  If it is then,         

# the DEB_BUILD_ARCH variable should be of non-zero length, indicating        

# that we are in the middle of a Debian package build (assuming the           

# user isn't doing anything strange with environment variables).              

if test -n "`dpkg-architecture -qDEB_BUILD_ARCH`" && ps | grep debuild | grep -v grep > /dev/null; then

  # Debian policy mandates that rpaths should not be encoded into a binary     

  # so it is overridden.                                                       

  hardcode_libdir_flag_spec=" -D_DEBIAN_PATCHED_LIBTOOL_ "

fi



# Whether we need a single -rpath flag with a separated argument.

hardcode_libdir_separator=$hardcode_libdir_separator

man/isamchk.1

+1 −1
Original line number Diff line number Diff line 
.TH ISAMCHK 1 "19 December 2000"

.TH isamchk 1 "19 December 2000" "MySQL 3.23" "MySQL database"

.SH NAME

.BR isamchk

 \- Description, check and repair of ISAM tables.