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

 5188 Akhila Maddukuri	2012-12-07 [merge]
       Null merge 5.6 -> trunk

 5187 Tor Didriksen	2012-12-07 [merge]
      merge 5.6 => trunk

    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).