Commit bee40ef1 authored by unknown's avatar unknown

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)
parent cbaf350b
......@@ -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
/*
......
......@@ -403,7 +403,7 @@ static void _lf_pinbox_real_free(LF_PINS *pins)
/* 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 -
......
......@@ -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 {
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment