summaryrefslogtreecommitdiff
path: root/bdb
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-12-23 14:36:40 +0100
committerunknown <lenz@mysql.com>2002-12-23 14:36:40 +0100
commit6f92badc0d37b55dad6d57d7ccef84f69dd82fcc (patch)
tree3bd92d59925233a3d96867614e50c49768219396 /bdb
parent4e01321b5cca6dccd48d812193fa591ceb705d7b (diff)
downloadmariadb-git-6f92badc0d37b55dad6d57d7ccef84f69dd82fcc.tar.gz
- Applied various patches provided by Christian Hammers (MySQL maintainer
for the Debian project) to fix some architecture-specific problems and some bugs Makefile.am: - put current directory (.) at front of SUBDIRS list, so that "distclean" is done last. IF done first, "distclean" in include directory fails because config.h is missing, which is removed by distclean in current directory. (thanks to "jww" for the patch) - make "distclean" in libmysql_r, too (Thanks to Christian Hammers from the Debian project for the patch) bdb/dist/aclocal/mutex.m4: - Sparc patch for mutexes/pthreads from Christopher C. Chimelis and Ben Collins from Debian (thanks to Christian Hammers from the Debian project for forwarding it) bdb/include/mutex.h: - Patch for building on m68k architecture (originally provided by Michael Fedrowitz for Debian Linux, thanks to Christian Hammers from the Debian project for forwarding it) ltconfig: - A hardcoded "rpath" is forbidden by the Debian policy (thanks to Christian Hammers from the Debian project for forwarding this patch) man/isamchk.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/isamlog.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysql.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysql_zap.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqlaccess.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqladmin.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqld.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqld_multi.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqldump.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) - fixed nroff mistake man/mysqlshow.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/perror.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/replace.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/safe_mysqld.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) scripts/mysql_fix_privilege_tables.sh: - fixed some typos - script cleanup scripts/mysqlaccess.sh: - make $script_log path less dependent on the shell scripts/safe_mysqld.sh: - applied patch provided by Debian to enhance security (This way all logs and databases are created world-nothing).
Diffstat (limited to 'bdb')
-rw-r--r--bdb/dist/aclocal/mutex.m42
-rw-r--r--bdb/include/mutex.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/bdb/dist/aclocal/mutex.m4 b/bdb/dist/aclocal/mutex.m4
index 5c9218da163..2010670599f 100644
--- a/bdb/dist/aclocal/mutex.m4
+++ b/bdb/dist/aclocal/mutex.m4
@@ -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__)
diff --git a/bdb/include/mutex.h b/bdb/include/mutex.h
index 4c1b265355d..9f341695cbf 100644
--- a/bdb/include/mutex.h
+++ b/bdb/include/mutex.h
@@ -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) \