diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h index cb41952b70cfd82681b3601abf657ecfad7d445b..57fbf35d18b12d200dee2614b79708aa0f272c2c 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 ff9c5a42f81de084368556eb0ddba0c7123720d4..054f33482f981762a0faef402a0c3776160eeff3 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 322f04cdc417292b677a16cf9fb76f778a7110ef..c197cc99711f19ac1572287980e79cd0a6486756 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 4c5f69ce7f9895a9e8b4580262259e5f10db6e60..8146cc6fc8c05e16a371f915f4c8e71ffdafe950 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 7f909be87cff59eb6a6c740099639527c9aa5faf..f2675aef91fe248fa45cf3f09549290600535939 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 a5fa4c1bfe813daa8dc7f8da10f728d58ed025a5..48476551ba8a38197525b2a4241cdd110081bd37 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);