From: Akhila Maddukuri
Date: December 7 2012 1:03pm
Subject: bzr push into mysql-5.6 branch (akhila.x.maddukuri:4736 to 4737)
List-Archive: http://lists.mysql.com/commits/145461
Message-Id: <20121207130328.24842.95125.4737@akhila-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4737 Akhila Maddukuri	2012-12-07 [merge]
        Null merge 5.5 -> 5.6

 4736 Tor Didriksen	2012-12-07
      Bug#15959313 CONVERT EXISTING UNIT TESTS FROM TAP TO GOOGLETEST
      
      Mostly simple rewrite:
      ok(predicate, message) ==> EXPECT_TRUE(predicate) << message;
      
      Remove main() functions, and add TEST(X,Y) instead.
     @ include/my_atomic.h
        declare my_atomic_initialized as extern "C"
     @ unittest/gunit/bounded_queue-t.cc
        Reduce test execution time.

    removed:
      unittest/mysys/
      unittest/mysys/CMakeLists.txt
      unittest/mysys/waiting_threads-t.c
      unittest/strings/
    renamed:
      unittest/mysys/base64-t.c => unittest/gunit/mysys_base64-t.cc
      unittest/mysys/lf-t.c => unittest/gunit/mysys_lf-t.cc
      unittest/mysys/my_atomic-t.c => unittest/gunit/mysys_my_atomic-t.cc
      unittest/mysys/my_malloc-t.c => unittest/gunit/mysys_my_malloc-t.cc
      unittest/mysys/my_rdtsc-t.c => unittest/gunit/mysys_my_rdtsc-t.cc
      unittest/mysys/my_vsnprintf-t.c => unittest/gunit/mysys_my_vsnprintf-t.cc
      unittest/mysys/thr_template.c => unittest/gunit/thr_template.cc
      unittest/strings/strings-t.c => unittest/gunit/like_range-t.cc
    modified:
      CMakeLists.txt
      include/my_atomic.h
      unittest/gunit/CMakeLists.txt
      unittest/gunit/bounded_queue-t.cc
      unittest/gunit/mysys_base64-t.cc
      unittest/gunit/mysys_lf-t.cc
      unittest/gunit/mysys_my_atomic-t.cc
      unittest/gunit/mysys_my_malloc-t.cc
      unittest/gunit/mysys_my_rdtsc-t.cc
      unittest/gunit/mysys_my_vsnprintf-t.cc
      unittest/gunit/thr_template.cc
      unittest/gunit/like_range-t.cc
No bundle (reason: useless for push emails).