From: Marc Alff
Date: May 13 2010 2:13pm
Subject: bzr commit into mysql-5.5-next-mr branch (marc.alff:2965)
List-Archive: http://lists.mysql.com/commits/108247
Message-Id: <201005131415.o4DEFiue012403@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7918865129298636310=="

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

#At file:///Users/malff/BZR_TREE/mysql-next-mr-marc/ based on revid:marc.alff@stripped

 2965 Marc Alff	2010-05-13
      test

    modified:
      sql/mysql_priv.h
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2010-05-13 13:36:14 +0000
+++ b/sql/mysql_priv.h	2010-05-13 14:13:40 +0000
@@ -1,5 +1,5 @@
 
-Commit email test, ignore, 7
+Commit email test, ignore, 8
 
 
 /* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.


--===============7918865129298636310==
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-marc/
# testament_sha1: f844def1334c1111598b837602f7c00d9daf4cfe
# timestamp: 2010-05-13 08:13:45 -0600
# base_revision_id: marc.alff@stripped\
#   nk0irw3icj2y3bt2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdyqSHAAAYhfgEAQUWf//3oC
AAC////wUAN56gPSnWm7AkpTEPU9IaaAGmJoGgAABhoaAAADQAAAAAxETQpp4p5T00ygGgxDRoMQ
CSST0jQA09UM0BonqNoTNCYAklMJoNEZMk9E2p6hT1PFM9KZNNPSfqcnPdjevfj6KUDcEaU1cGeA
Ad2WD59kLBqiEd2YvvUyyFDp8J55fvruzCW1orehWh8oCqvw03XfCofRJT6gWy3uSPxsdMs7hoCN
+HgbsJi4SeRqiGdJokWpH6VYyxhsIvnFJkCzA4O+jW0NIqEMiRAERDBBwmGsIlAhy4C1LB1B394M
KZY0GCce6sS0rL+cX06Wbon3PaIiQVixDqRHimUFcrDHf7lETmfkKjsLI23PqSNHUUELGwVATJJj
if+XEvkLhQkTGUGBGIPHVFmoUdAvwrrCTFYmJjCcZwO40IDio/Ry5kqvtSI/hZwd3K4yOheXmBwv
OI+95wCd5I5aq4ccfnlvKTfYdfhxgUw5k1MLahZYyWZMcSZ5wNNKRXQIzMsCI8zIlDiNOCYsT5jw
hqt58sLgxMTPLc7VsX4w5lCon8xPcRtFFBIxuuMmP+YhSpwF4p1X1hY0RxsMWmhsZlurzyPXjxSL
bygOvukf1iYQ37vmQKwTLsemXQ8SOTw5BaCgXYGpOP2vl3UDglZkhvhI1WsFBespk1cWckoMR+68
DAqyCtK9eR2H6+ZUPC48HntM0b4zo+yZHffPzyDiX4EBoSAxen34/TkmmZnoMQ/nUJJDxiRoC3Fy
M6S4ChP3XlTRnE/Ys+dVQkI9KnMwMhZEmSEwpRwXXdhROhjwxwCA+wJ/PGh+8DyDIDxME/nwFiD8
YpQpIcyRSjlFIkMvMAVOa7HSkbO2/QqhybDBWjuV5kYWm1NhVX7f5NxZUB3npW8HwodQj6TazAIs
hk+/qKHBI7NED0f7jB2SPUPKxQct3gbB+BPFu+SSZVDAVQanTv6E1oyu6FFI20R5HaxY1EkpoCC2
0WODZrvtReiao0G2muMQJhMhiAxaIStGd0UkQGgtibeGYSRJG+qt/riG3pCkwiOa7h5sU/GOw8kF
S6jJ7K+I4rNfr41bpKpT++IGwrQ28oCqMikI3tqFFH9ijUDfkUrjgc4WYWi/Yu5IpwoSG5VJDgA=


--===============7918865129298636310==--