diff options
| author | unknown <serg@janus.mylan> | 2008-02-13 18:25:56 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2008-02-13 18:25:56 +0100 |
| commit | bee40ef1d0756c2dc05c6ce75774b972a78410e9 (patch) | |
| tree | 253c09616d11a8775843ea6100977feb3791c02d | |
| parent | cbaf350bcbaaa1246bc8e53c802ba2232a3dd4ac (diff) | |
| download | mariadb-git-bee40ef1d0756c2dc05c6ce75774b972a78410e9.tar.gz | |
build/test failures on different platforms
include/atomic/rwlock.h:
define MY_ATOMIC_MODE_RWLOCKS if this is the way we have to go
mysys/lf_alloc-pin.c:
no semicolon
mysys/lf_hash.c:
no semicolon
storage/maria/lockman.c:
no semicolon
storage/maria/ma_loghandler.c:
no semicolon
unittest/mysys/my_atomic-t.c:
powerpc is no better
(condition could be a bit too broad, but hey, it's just a unit test)
| -rw-r--r-- | include/atomic/rwlock.h | 1 | ||||
| -rw-r--r-- | mysys/lf_alloc-pin.c | 2 | ||||
| -rw-r--r-- | mysys/lf_hash.c | 2 | ||||
| -rw-r--r-- | storage/maria/lockman.c | 2 | ||||
| -rw-r--r-- | storage/maria/ma_loghandler.c | 2 | ||||
| -rw-r--r-- | unittest/mysys/my_atomic-t.c | 6 |
6 files changed, 6 insertions, 9 deletions
diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h index cb41952b70c..57fbf35d18b 100644 --- a/include/atomic/rwlock.h +++ b/include/atomic/rwlock.h @@ -14,6 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef struct {pthread_mutex_t rw;} my_atomic_rwlock_t; +#define MY_ATOMIC_MODE_RWLOCKS 1 #ifdef MY_ATOMIC_MODE_DUMMY /* diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index ff9c5a42f81..054f33482f9 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.c @@ -403,7 +403,7 @@ found: /* lock-free memory allocator for fixed-size objects */ -LF_REQUIRE_PINS(1); +LF_REQUIRE_PINS(1) /* callback for _lf_pinbox_real_free to free a list of unpinned objects - diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index 322f04cdc41..c197cc99711 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -28,7 +28,7 @@ #include <my_bit.h> #include <lf.h> -LF_REQUIRE_PINS(3); +LF_REQUIRE_PINS(3) /* An element of the list */ typedef struct { diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c index 4c5f69ce7f9..8146cc6fc8c 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -211,7 +211,7 @@ static enum lockman_getlock_result getlock_result[10][10]= #undef A #undef x -LF_REQUIRE_PINS(4); +LF_REQUIRE_PINS(4) typedef struct lockman_lock { uint64 resource; diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 7f909be87cf..f2675aef91f 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -719,7 +719,7 @@ void translog_table_init() #ifndef DBUG_OFF check_translog_description_table(LOGREC_FIRST_FREE -1); #endif -}; +} /* all possible flags page overheads */ diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c index a5fa4c1bfe8..48476551ba8 100644 --- a/unittest/mysys/my_atomic-t.c +++ b/unittest/mysys/my_atomic-t.c @@ -313,18 +313,14 @@ int main() #ifdef MY_ATOMIC_MODE_RWLOCKS -#ifdef HPUX11 /* showed to be very slow (scheduler-related) */ +#if defined(HPUX11) || defined(__POWERPC__) /* showed to be very slow (scheduler-related) */ #define CYCLES 300 #else #define CYCLES 3000 #endif #else -#ifdef HPUX11 -#define CYCLES 30000 -#else #define CYCLES 300000 #endif -#endif #define THREADS 100 test_atomic("my_atomic_add32", test_atomic_add_handler, THREADS,CYCLES); |