List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:January 19 2012 12:27pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3767 to 3770)
View as plain text  
 3770 Bjorn Munch	2012-01-19
      Remove trailing spaces in memcached additions to MTR

    modified:
      mysql-test/mysql-test-run.pl
 3769 Bjorn Munch	2012-01-19
      Apply patch for 7.2.4 release

    modified:
      INSTALL-SOURCE
      INSTALL-WIN-SOURCE
      cmake/make_dist.cmake.in
      cmake/mysql_version.cmake
      cmake/package_name.cmake
      libmysqld/CMakeLists.txt
      man/CMakeLists.txt
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
 3768 Bjorn Munch	2012-01-19
      Revert back to clone from main branch

    modified:
      INSTALL-SOURCE
      INSTALL-WIN-SOURCE
      cmake/build_configurations/mysql_release.cmake
      cmake/make_dist.cmake.in
      cmake/mysql_version.cmake
      cmake/package_name.cmake
      configure.cmake
      extra/innochecksum.c
      libmysqld/CMakeLists.txt
      man/CMakeLists.txt
      mysql-test/collections/default.release.in
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/src/schedulers/S_sched.cc
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
 3767 Bjorn Munch	2012-01-19
      Do not run embedded tests for release

    modified:
      mysql-test/collections/default.release.in
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2011-11-25 12:33:54 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2012-01-19 12:22:12 +0000
@@ -31,10 +31,10 @@ ENDIF()
 SET(FEATURE_SET "community" CACHE STRING 
 " Selection of features. Options are
  - xsmall : 
- - small: 
- - classic: archive + federated + blackhole 
- - large :  archive + federated + blackhole + innodb
- - xlarge:  archive + federated + blackhole + innodb + partition
+ - small: embedded
+ - classic: embedded + archive + federated + blackhole 
+ - large :  embedded + archive + federated + blackhole + innodb
+ - xlarge:  embedded + archive + federated + blackhole + innodb + partition
  - community:  all  features (currently == xlarge)
 "
 )
@@ -59,6 +59,9 @@ IF(FEATURE_SET)
     SET(WITH_NONE ON)
   ENDIF()
   
+  IF(num GREATER FEATURE_SET_xsmall)
+    SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
+  ENDIF()
   IF(num GREATER FEATURE_SET_small)
     SET(WITH_ARCHIVE_STORAGE_ENGINE  ON)
     SET(WITH_BLACKHOLE_STORAGE_ENGINE ON)

=== modified file 'configure.cmake'
--- a/configure.cmake	2011-11-15 20:24:52 +0000
+++ b/configure.cmake	2012-01-19 12:22:12 +0000
@@ -24,11 +24,6 @@ INCLUDE (CheckCCompilerFlag)
 INCLUDE (CheckCSourceRuns)
 INCLUDE (CheckSymbolExists)
 
-# Turn on c99 mode when compiling with Sun Studio
-IF("${CMAKE_C_COMPILER_ID}" STREQUAL "SunPro")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -xc99")
-  MESSAGE("-- Running ${CMAKE_C_COMPILER_ID} in c99 mode")
-ENDIF()
 
 # WITH_PIC options.Not of much use, PIC is taken care of on platforms
 # where it makes sense anyway.
@@ -1014,45 +1009,6 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
     return 0;
   }"
   HAVE_GCC_ATOMIC_BUILTINS)
-  IF(NOT HAVE_GCC_ATOMIC_BUILTINS)
-    # Try if atomics become available once we instruct gcc
-    # to generate pentium+ instructions.
-    SET(SAVE_C_FLAGS "${CMAKE_C_FLAGS}")
-    SET(SAVE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=pentium")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium")
-    CHECK_CXX_SOURCE_COMPILES("
-    int main()
-    {
-      int foo= -10; int bar= 10;
-      long long int foo64= -10; long long int bar64= 10;
-      if (!__sync_fetch_and_add(&foo, bar) || foo)
-        return -1;
-      bar= __sync_lock_test_and_set(&foo, bar);
-      if (bar || foo != 10)
-        return -1;
-      bar= __sync_val_compare_and_swap(&bar, foo, 15);
-      if (bar)
-        return -1;
-      if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
-        return -1;
-      bar64= __sync_lock_test_and_set(&foo64, bar64);
-      if (bar64 || foo64 != 10)
-        return -1;
-      bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
-      if (bar64)
-        return -1;
-      return 0;
-    }"
-    HAVE_GCC_ATOMIC_BUILTINS_WITH_MARCH_PENTIUM)
-    IF(HAVE_GCC_ATOMIC_BUILTINS_WITH_MARCH_PENTIUM)
-      SET(HAVE_GCC_ATOMIC_BUILTINS 1)
-      MESSAGE("-- Using -march=pentium to enable atomic builtins")
-    ELSE()
-      SET(CMAKE_C_FLAGS "${SAVE_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS "${SAVE_CXX_FLAGS}")
-    ENDIF()
-  ENDIF()
 ELSE()
   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
 ENDIF()

=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	2012-01-18 13:34:35 +0000
+++ b/extra/innochecksum.c	2012-01-19 12:22:12 +0000
@@ -25,9 +25,6 @@
 */
 
 #include <my_global.h>
-
-#define _XOPEN_SOURCE 600 /* needed to include getopt.h on some platforms. */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>

=== modified file 'mysql-test/collections/default.release.in'
--- a/mysql-test/collections/default.release.in	2012-01-19 08:29:54 +0000
+++ b/mysql-test/collections/default.release.in	2012-01-19 12:22:12 +0000
@@ -12,5 +12,6 @@ perl mysql-test-run.pl --force --timer -
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts      --suite=parts
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=stress     --vardir=var-stress     --suite=stress
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=jp         --vardir=var-jp         --suite=jp
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded   --vardir=var-embedded                    --embedded-server --skip-rpl --skip-ndbcluster
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist       --vardir=var-nist       --suite=nist
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist+ps    --vardir=var-nist_ps    --suite=nist     --ps-protocol

=== modified file 'storage/ndb/memcache/src/schedulers/S_sched.cc'
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-01-18 13:34:35 +0000
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-01-19 12:22:12 +0000
@@ -834,7 +834,6 @@ void * S::Connection::run_ndb_send_threa
       timeout_msec = timeout_min;  /* we are now "busy" */
     }
   }  
-  return 0; /* not reached */
 }
 
 
@@ -921,6 +920,7 @@ void * S::Connection::run_ndb_poll_threa
     }
   }
   return 0; /* not reached */
+  return 0; /* not reached */
 }
 
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3767 to 3770) Bjorn Munch20 Jan