From: vasil.dimov
Date: February 28 2011 9:02am
Subject: bzr commit into mysql-5.5-innodb branch (vasil.dimov:3338)
List-Archive: http://lists.mysql.com/commits/132085
Message-Id: <20110228090258.55C0C2E0ED@mail.v5d.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8877831646458167308=="

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

#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:vasil.dimov@stripped

 3338 Vasil Dimov	2011-02-28
      Change InnoDB plugins author to Oracle Corporation

    modified:
      storage/innobase/handler/i_s.cc
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
@@ -47,7 +47,7 @@ extern "C" {
 #include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */
 }
 
-static const char plugin_author[] = "Innobase Oy";
+static const char plugin_author[] = "Oracle Corporation";
 
 #define OK(expr)		\
 	if ((expr) != 0) {	\


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vasil.dimov@stripped
# target_branch: file:///usr/local/devel/bzrroot/server/mysql-5.5-\
#   innodb/
# testament_sha1: eb96366e5e34cf634a097996d3a88c55923e9d18
# timestamp: 2011-02-28 11:02:58 +0200
# source_branch: file:///usr/local/devel/bzrroot/server/mysql-5.5-\
#   bugfixing/
# base_revision_id: vasil.dimov@stripped\
#   z27sh3x73qk8zq0a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWKYAFYAAYpfgAAQUmP//18g
gQq/7//wUAN6vZ3S3To3K7QkkQEwQYhqep6U9pT2kj0IPSPNUAkpNTGJoGkMppk0ZAaAAACSITSP
QJ6qeT0RtSGg2gTQD1BhgAAAANAAAAAAkkmjVP0ap6mbVPQT1NMmj0gAAaBXPc32//Js8thXFqAf
d9sL84wzt6mrhczMU81zjY1rJ3dn9Pc7NZ4lng+Nv40+Gbo4HUyDnRdq0Vvwepu5IVEPnKuYj9Lb
opK/bv55chWBWUMFmkUSJ40eNkVNmY7uLtYnskZ0+QsgnCIloP2OEYSVSjvB9cCsjD0VAr+sAjYa
MZBDnuU2gjfTdq090fIwmm4e61+vtXjQXWlLK3jWKv0YgF53CLdMt0orqYniLoh6Cm0/wNERU8mB
h3pSNbKx1Rg5aIbY0KZF6kPISKQ3hEVxcs5OQfrZNKBk1A6JlDJHtN6xMYWatBa3NbqjGJyBGi2t
XqwzxYXSp1Jscq61g1iZvFZsatP8FDc6vCEFZkwUnWqYLtKnEW4MCpw3HPHNXoyCmutUFM6TLBVC
97jh16ugldApVtZCscWs2OpOmm0S0Io2kgRN1LTKw8p2yfHj00FPVI/MtDDM3a2o9WhkScSpx35I
XOcHTuxVJmKA06TQuU6+21ClBYDTLC2oKaqnqoMWnR4uSL1HGbc+XNY7NevlxUG69ZCl4htciHfl
MTLm9Qr6qdf2i+etxe9kKNIhhwpr1YWWFJPQokyZUjufsVRbwXKXpEFB3A/WIVw+B0riaUWS6Nzt
2odPIHPhoJjLc97YV/ebSzfDjI6JlUsK9nC/YeW0lCJO1yprrLdw812WqAjJzvu472MR0SNQuRTY
DMGazfIxYTJjAV8Z7TQtRz6poN5SCrTz7QJGyjqFUr8806ayQbDaGujbnm1QvgNYrw1UMkcgRCLg
4B7JDG5aY6T+BySOKs26isnBRioQYGbpioAyg78Nf+juGsyQ7JlpvkX1BSFm8D5H7SJhU1LsHgpT
BWDXTZk4fQWEMtVoeQaLyMxN+jJLcmHot4XkhT4zWx8IEWiyzgSXIUr408w6nJ4AtwPatna+LL3o
fGeZnwNGPkbcSmTMoExQ8IBmnmV1sDjphErBRD5OwZ2MlcF4sAcvEkwzM3NSEsp3H8J3qH+LuSKc
KEgxTAArAA==


--===============8877831646458167308==--