From: Marc Alff
Date: April 26 2010 4:30pm
Subject: bzr push into mysql-next-mr-wl5291 branch (marc.alff:3139 to 3140)
List-Archive: http://lists.mysql.com/commits/106549
Message-Id: <20100426163020.C8AA649975C@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_2cyb2Y/MTTuwiG4o7nrZQQ)"

--Boundary_(ID_2cyb2Y/MTTuwiG4o7nrZQQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3140 Marc Alff	2010-04-26
      New tree

    modified:
      .bzr-mysql/default.conf
 3139 Alexander Nozdrin	2010-04-12 [merge]
      Auto-merge from mysql-trunk.

    modified:
      sql/mysqld.h
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2010-03-25 07:26:12 +0000
+++ b/.bzr-mysql/default.conf	2010-04-26 16:29:52 +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-wl5291"


--Boundary_(ID_2cyb2Y/MTTuwiG4o7nrZQQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl5291/
# testament_sha1: 9263a19c647d98cf2d6746995efbfb268e48f128
# timestamp: 2010-04-26 10:30:20 -0600
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR0JwLcAAXFfgEAQUWP//3ID
AAC////wUANZ5cE46pW2wipKbVPZpTYk3oTRTxMJH6o8pppiBhJQRqemQap4oep6QANAAADFDSk/
Snkw1TymmTENNMmmnqaNADAAAAADQaANANAJJJkTU2CmwU9NT0jQNPUDRoZNKLWdmGNe4WQKCMkq
rnvJizrpwUM+51Q25UljwDLm5ulJcMmR37jQOKeuaFSB/Kc1fjhPqlkshmSfeS6dryDFuDjv5LD7
nIxFlMVTlSpCQ4PFcUu1JYawYWhVFb8IZolnkQ5m3NpvSJhnLiwjMs9JEZDAYJpkcBQwQ06xcYtY
TTvkz0QIZPgVnwm49BteFXNX4iCiMgKGXhktWTG0iUNz19ZbwyNEEXCTk5MTc6mSFeVBMgOFg8LT
EzUXj2KCsTycdkIDmpHKszM0DkFgnnyP+8bHaEsFLHR9aoJqvIK4oXnQuZYz2jBSHCltvqJUNiyN
zqlwFbY+OA41IlC4momQwxLqpqRaRvqTixv7qPKFxhWy3Foqxjy8Vwc42SMS0BEBtAr9BJA8UNUI
LW6I7psks6OrkNm18XCKc/WTxAqhlRQ5qNkssXBAqjhSwvDwMBeP57dJaokwX818rYH2tbM9XT9/
haxg4uZ6SOZIuOBccSrUbG2+C8ybyLtBE5HyP/Pr+8poLDapxg9RjSWSIszCgdPSFWo3Dw7buyFO
BDZgWGHhbyieZmr8TQPB/dQZmWzaxmm3pkVKKmi68LinUnygcrDQoWV5nRYaZ1nYEgNB6buJ4VTO
XPzHgM97F98TftMQ6p01qqWOGJRP/CgQMjSrbw6ggX7wn463PrA0K0DfqvZ58cCQSCTtdg5NL6me
hYP+ipcw7RYO+ujJT+dTqw4sWbZWYUT8iTYdphjV6xp0hC1gOv5nvRIEJxk6KLbuB7IZO50XAnge
DlEjmlrCRVue/dhaY44uU5nD6OQ6nSOjGqohS5XjY0YTkS9hWSNLACYzuBq3X1ovlGRpk+0BgyCE
ypviErBouexKdIDRrZao1GGANMKt+ZsWQvF0DrgVfQnUYGeXA7i1oCl7tkzPBlMX8K2hIOtzvf6a
kN/18SkNUAWIquQCUD3nCJ5F1bDqfLeDds/xdyRThQkB0JwLcA==


--Boundary_(ID_2cyb2Y/MTTuwiG4o7nrZQQ)--