bk commit into maria tree (serg:1.2592)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
maria repository of serg.  When serg does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-13 18:25:56+01:00, serg@stripped +6 -0
  build/test failures on different platforms

  include/atomic/rwlock.h@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -0
    define MY_ATOMIC_MODE_RWLOCKS if this is the way we have to go

  mysys/lf_alloc-pin.c@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -1
    no semicolon

  mysys/lf_hash.c@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -1
    no semicolon

  storage/maria/lockman.c@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -1
    no semicolon

  storage/maria/ma_loghandler.c@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -1
    no semicolon

  unittest/mysys/my_atomic-t.c@stripped, 2008-02-13 18:25:52+01:00, serg@stripped +1 -5
    powerpc is no better
    (condition could be a bit too broad, but hey, it's just a unit test)

diff -Nrup a/include/atomic/rwlock.h b/include/atomic/rwlock.h
--- a/include/atomic/rwlock.h	2007-02-28 17:14:57 +01:00
+++ b/include/atomic/rwlock.h	2008-02-13 18:25:52 +01:00
@@ -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 -Nrup a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c
--- a/mysys/lf_alloc-pin.c	2007-12-04 22:23:00 +01:00
+++ b/mysys/lf_alloc-pin.c	2008-02-13 18:25:52 +01:00
@@ -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 -Nrup a/mysys/lf_hash.c b/mysys/lf_hash.c
--- a/mysys/lf_hash.c	2007-08-22 09:56:08 +02:00
+++ b/mysys/lf_hash.c	2008-02-13 18:25:52 +01:00
@@ -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 -Nrup a/storage/maria/lockman.c b/storage/maria/lockman.c
--- a/storage/maria/lockman.c	2008-01-10 13:20:19 +01:00
+++ b/storage/maria/lockman.c	2008-02-13 18:25:52 +01:00
@@ -211,7 +211,7 @@ static enum lockman_getlock_result getlo
 #undef A
 #undef x
 
-LF_REQUIRE_PINS(4);
+LF_REQUIRE_PINS(4)
 
 typedef struct lockman_lock {
   uint64 resource;
diff -Nrup a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
--- a/storage/maria/ma_loghandler.c	2008-02-11 21:53:26 +01:00
+++ b/storage/maria/ma_loghandler.c	2008-02-13 18:25:52 +01:00
@@ -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 -Nrup a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c
--- a/unittest/mysys/my_atomic-t.c	2008-01-10 13:20:58 +01:00
+++ b/unittest/mysys/my_atomic-t.c	2008-02-13 18:25:52 +01:00
@@ -313,17 +313,13 @@ 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