diff options
| author | monty@mashka.mysql.fi <> | 2003-01-16 20:47:46 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-16 20:47:46 +0200 |
| commit | f4b950df960a96a06b4a97fe1f4cee22e52e7d5d (patch) | |
| tree | e1fdb60db4adfe4fafddb5d063b62fbb7cff6326 /bdb | |
| parent | c16e908a2bb32c4ae945b0d0856a92ae309c8514 (diff) | |
| parent | 6250c1d974877fc1a678c3438fc9cc5b95222089 (diff) | |
| download | mariadb-git-f4b950df960a96a06b4a97fe1f4cee22e52e7d5d.tar.gz | |
Merge with 3.23
Diffstat (limited to 'bdb')
| -rw-r--r-- | bdb/dist/aclocal/mutex.m4 | 2 | ||||
| -rw-r--r-- | bdb/include/mutex.h | 2 |
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) \ |