From: Marc Alff
Date: August 12 2010 10:56am
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3205)
List-Archive: http://lists.mysql.com/commits/115566
Message-Id: <201008121057.o7C2hXsC027326@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0380772447755180988=="

--===============0380772447755180988==
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-bugfixing-merge/ based on revid:marc.alff@stripped

 3205 Marc Alff	2010-08-12 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-08-12 00:26:10 +0000
+++ b/sql/sql_parse.cc	2010-08-12 10:56:05 +0000
@@ -501,7 +501,6 @@ static void handle_bootstrap_impl(THD *t
   char *query;
   int length;
   int rc;
-  const char* found_semicolon= NULL;
 
   DBUG_ENTER("handle_bootstrap");
 


--===============0380772447755180988==
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-bugfixing-\
#   merge/
# testament_sha1: 4daa63c889d4f29577f295dc116424b3ab918d1a
# timestamp: 2010-08-12 04:56:41 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: marc.alff@stripped\
#   ikoi70duzvihrgcp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdp1o0AAAvpfgAAQUGP/93IC
AAC////wUAW28hqqibdgoADphKVPKPUaGjammg8KaGgaBoGglEg0yZU8wQqfqmjaNEGgyNNBJEFP
TInlU8p+qfqZDSaD1AHqDQYaGmgBoADQAAyGgKlImIE9CYCYJkaBTaRkaSsEPPow+YyxSswmt2iw
SFGCFR1rh78rhuL+szvhRxmZl9eodoRJDBdrs9owGg/UmW6n09DXlHB2ojBl2VMbQ8G/fR2ilVUj
jtpYi4+xML7eelnbDpwcGeblJUxPwv3tTyLHNOltVNInBPBQBb9+pHOTu/djoTE7MwzHedBDP4I+
4xKICmYIAK4RExYMk0FSKcgjA4MwjUVBOkeEWmIUHKBKVRSSrwnmsyhU3F+Yj8YDRhN5FKAlfrdW
Ig4iDIJNsHLI6HMpEkV4sJDJHmLCWchl3nwIp+zM3liQKJmfXowebhoZOLMbzuuctnD2Hko1VaOD
ptFXMBMki0VKbyNatReHYnwNKFr+nMW897SJntEwnpvUkCORI6jqqYJNyKM8l6CLFhEuDXEVThzn
jcZnGKxhvMLTNhkBmprI7Q4MAbOdYqKJOimIh2/LBog0bU0k+LtANAoLT9E5QURU71eHHTQ4epl4
6sawTMqL+DqT7DAR6trvPgoEjZMo9b1ovsHTHTSA8RYD2QvvuRTeWOR5NocYnxdhY3Qec1LbCG4w
KzwoGp4JnlfMVK2OwYmCpfbUwyEl3SZKxzASOQjidyrZKgKJ68rLORidStyUMbic5M1AntHSI8gg
4bzcecrEGGjsbsbEmyKR0ocFlSeQxSBneMRsDvA4FLlxMqsuqtUSi5S0tkutUfJsd2tictlKIXHi
fk6/YoAm1oEXCiiKevNypE0LkDkT28LwqQUA8oflomEIXqSO981tomDlWAjGSDcipxiI6e4m6/c2
rXxTLry/85iaEaaJVGv74HxsZPdxr9q9z46dEwV3WzLSl3K3fPU1J6DayJQT3ws2ddurZV7nbXzT
Ge+bJp5ul9FBPbEiXKdJ5RpX96mpr7K2xTWXs0Zrk+Ercd1qeGjw4sjJd6VOpifXOaWvUlSJ758t
lqvietVizRmXKe7u1OrTRSq9iRM710wHQa7XhRpdnUSncqCJqZFhp4KJF2CwvhWlE/Jp4b31xeet
2VmIeK5K3NuTTUpQzPBw6s1kibKHJtXNisSyZzQ/b1ezmebXXPRjorj8l/TebIWVPg0vp6rZ+KuY
/s4nfNtnybDqtUn1Ks7Q8X8Si1zPabEwTZsS036JL92Wk/3k1LFmwXjWndX4FHH3znDtOORRia9s
mWfKOScB9GaTDKZmAWJdMYlCn8eaJqaGFjO6PNE2z9v8UqFFSlXk7RkdWBmMbgwT1Mii5cYVirqp
iuZlHKULGFZJWuVRXSphruezqYG1F1EtqSo8K68N63tNpJYPhgn8E7yY4t+a0z43JLJ46lFE80sN
Vzmx14Frs1mQlr9a7mx+kUZZJPt42omQ0GqtF7q0n6mQ1ZYxsPVss8VtiXKrHMqSrUwL0v40Uoxu
A71MM/qilPR6KML5KlRkMcnRTPpcl6VkCAYPk5obB1PEoa6mYVSslci4tCAvaP2Xb1RmTb1P3nOy
9evq9mGdTElie08h2R9Jv3ZT8IuRXGsxHkYxclSP7+/j5MWKccTjLBD+LuSKcKEhtOtGgA==


--===============0380772447755180988==--