List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:October 3 2011 7:37am
Subject:bzr push into mysql-trunk branch (jon.hauglid:3465 to 3466)
View as plain text  
 3466 Jon Olav Hauglid	2011-10-03 [merge]
      Merge from mysql-5.5 to mysql-trunk
      No conflicts

    modified:
      unittest/mysys/my_atomic-t.c
 3465 Vasil Dimov	2011-09-30
      Do not skip InnoDB during install step on Windows.
      
      Submitted by:	Daniel Fischer

    modified:
      cmake/create_initial_db.cmake.in
=== modified file 'unittest/mysys/my_atomic-t.c'
--- a/unittest/mysys/my_atomic-t.c	2011-06-30 15:46:53 +0000
+++ b/unittest/mysys/my_atomic-t.c	2011-10-03 07:31:55 +0000
@@ -164,7 +164,14 @@ void do_tests()
   test_concurrently("my_atomic_cas32", test_atomic_cas, THREADS, CYCLES);
 
   {
-    int64 b=0x1000200030004000LL;
+    /*
+      If b is not volatile, the wrong assembly code is generated on OSX Lion
+      as the variable is optimized away as a constant.
+      See Bug#62533 / Bug#13030056.
+      Another workaround is to specify architecture explicitly using e.g.
+      CFLAGS/CXXFLAGS= "-m64".
+    */
+    volatile int64 b=0x1000200030004000LL;
     a64=0;
     my_atomic_add64(&a64, b);
     ok(a64==b, "add64");

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:3465 to 3466) Jon Olav Hauglid3 Oct