From: Marc Alff
Date: July 22 2010 11:56pm
Subject: bzr push into mysql-next-mr-wl2110 branch (marc.alff:3164 to 3165)
List-Archive: http://lists.mysql.com/commits/114181
Message-Id: <201007222357.o6MM5inW000510@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7637646504113026003=="

--===============7637646504113026003==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3165 Marc Alff	2010-07-22
      New tree

    modified:
      .bzr-mysql/default.conf
 3164 Alexander Nozdrin	2010-06-29 [merge]
      Auto-merge from mysql-next-mr-gtest.

    added:
      config/ac-macros/gtest.m4
      sql/sql_alloc_error_handler.cc
      sql/thr_malloc.h.moved
      unittest/CMakeLists.txt
      unittest/gunit/
      unittest/gunit/CMakeLists.txt
      unittest/gunit/FindGTest.cmake
      unittest/gunit/Makefile.am
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/sql_list-t.cc
      unittest/gunit/tap_event_listener.cc
      unittest/gunit/thread_utils-t.cc
      unittest/gunit/thread_utils.cc
      unittest/gunit/thread_utils.h
      unittest/mytap/t/CMakeLists.txt
    modified:
      .bzrignore
      CMakeLists.txt
      Makefile.am
      configure.in
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/thr_malloc.cc
      unittest/Makefile.am
      unittest/unit.pl
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2010-06-26 07:39:21 +0000
+++ b/.bzr-mysql/default.conf	2010-07-22 23:55:51 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-next-mr"
+tree_name = "mysql-next-mr-wl2110"


--===============7637646504113026003==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl2111/
# testament_sha1: 36a452ca7d26019bc59e83163ad217ac07a5984b
# timestamp: 2010-07-22 17:56:40 -0600
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfUdbWEAAVvfgEAQUGP/93ID
AAC////wQAMHOitTWADIpo0ExRvTTVPJoDUG0mJkPSDGhoaADIaAAAAADJTyKaeKnpmpBtGkZonp
BoYJgSSAjQGpk0CCepoyGmhoMnBk8Bzq+hbZ5iipyktCOkiisbclWNaInTI92SUoqpxslTn45aHo
RnNtdRSxr9JVCNQ3ZntMO4IteYQrKBo7eQW9siruKVocUrVWcLI8oosGYReujCHBUwFouWQdrCs1
E5aKlF+CeBunG7NZC8Jio0uywR49CzMJ2wGQoVaCm6KmEfSSfQ82HieUny3PibkFJUI6xoret+Or
O3pkLrtkWqKjLeK8FuxmLN65ZWUkF/8u7+dd7xpkaPyExwjF1g87uAn0MFFP1DprnHcDYG6zCRQT
PV6pioimJ1sDE9SbizWVdJBg8yrch11wWb6SYyoUqzg5sal4NYrqUvmwaiqgvrySg6M8tLbr07K/
cQrKVCkkpY5p1XhjhhBoRueTHJptEiCRqeoeNjpnKm9LeW+0nYBPLQhQdeVwqjpQj99mCAUEDPdr
x9/HqlO5weCWIeORlHr68UrkMuK8OwO86mHUHbgaQBHiEKgwlzOGN48IcjD0giE3EjTkVOD3YLLY
JzxCwDSyM2Q90rwGgydateRApey8bLxqjZl4xomxgJPAbMMIrfovVKnBGwOhz3IOCDYw/ChpNM7L
c+fyEoGdYaWWxFBlfugHrGS4xqLoBCah+cOk5pUfGsFPijoLmp7CbiEvx3K9acSwx+nsmh3GobJ5
peF3935PzC1fAO177llocQdUKr1WofwoFHhZakx7c0jemz5hZ9RHkJvM8xtuHYqD8DhZnGJ4rtWx
JW3ypDIGXDtuiELRk52GeKIMoCcueGySeHk5PPZLgElo5X341Zk4fgpVjEXy5r0NGIDWVTFEjykB
iLEm9F3TImK3ai1o+sYh8VHOGavW1tQaa5flWEw2Bt3X3O9XwhAxa7UnKvOhgrQotrXSZVz9Hi5X
q1GygtEbhkUFBfRbKitvJ8v+LuSKcKEh6jrawg==


--===============7637646504113026003==--