From: Marc Alff
Date: August 12 2010 10:44am
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3198)
List-Archive: http://lists.mysql.com/commits/115562
Message-Id: <201008121044.o7CA9lUu021596@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0422850667302796483=="

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

 3198 Marc Alff	2010-08-12
      Build warning cleanup

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-08-10 11:58:46 +0000
+++ b/sql/sql_parse.cc	2010-08-12 10:44:30 +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");
 


--===============0422850667302796483==
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-trunk-bugfixing-\
#   merge/
# testament_sha1: a932a18a8df9a6ad61ee0eb81a3f4d904aeb4e51
# timestamp: 2010-08-12 04:44:35 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: marc.alff@stripped\
#   ml52d2ffah1u9jn5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ8AxUIAAXJfgAAQUGP/93IC
AAC////wUANaWUl7tGc7u4SmpCaNMIaYp+U0mm01PSD0mgAkkTFM1NqT2Qij2qejKaMjRpo0BJJk
ECBoFNHqe1Jpk09RiAxhoaaAGgANAADIaBJSaExpNGj1J+iTan6pgBAZNqbeB2yNN+7YsZXG1kbq
SzzlO2vSbMx28j2ijGDWeR42yy9f2unumHTLTTrsObJMQsjG0HYYl7U3lttdDZ17LCZ9RUMWtOhi
+uKaOd8jOQla8Z2DZiIxjQUSjGRAMXokpEug4zJfCAUsCs7KE5OWPeLIqybaILDxxTxhOaxpzg58
UEFGDq728/wm9b65bp1+vbMoRkb56VcbKSkzJpl4i9ByuULq5xTQNNeNueU+ek7+fQ48cQmF83UZ
al/hZ3CjvbETERU2OsdCCU7amNNjWBKk+Iyts0BfK6IoxyoQLy3tS5/xWFZ49yyZfyFH4YG6/q5j
3OmuO45Iea2Ot2lKrE1Nhcsx8zeR4OuVhlD7MJ4LpjsI3GfIQ8bXMLq3xheXWN+EqFjKh1i87i3C
xOXcp2ijFHylrlwakwucarJqtAgEZN5Gf0zv20T+3p5ZCOWE5Ax+tXtPF6NV7+FwwWwuFfE6Yt69
BGWetoPXARbVbnnKdXiAjKjFikbnnaY+RcudnXzUWqPf7cgrlZDEJq+mosT2lOL4aUhjrFI4NoUn
4O8cu/uNAxooJnKPE4dNiHnjvTJHbn6NceToHoLHC7HYnT6we70hbv0UUrVngPr4SVqXu4kM2Tfx
yutuhuviNISM59gjjRrvJ5GZoZCGN7UFP3zxv8YRGMyiPg3MW5bOuEjezuAdx5PkbjjGhUFXT+ZS
cTbtTR/EHUv/r8802gN4bq232HJQoZk0hyFcQDmOU6Y6UJl7lIhgzHAFbmoqNwuyQ9dzwMkhFOjL
mKucL6GDVqWa09Tdkx1rMHZXWivj1I5IqypJSMpap8QTh5uf8R4BVU83Wu75LbmzLqoN1OlzxTTM
vRG1j1E0xL2ygkXmRZ6N/fUwKzV8umcOEYKTocxzO2x0NRBEzwUp1XLkpfVziY1BeqtyTyro6eww
4ad73FQOCyWRPw+l1F6e3ewjW50m/9Gq4Ii1PoOwuInWdjkXKqkL0/Hlaxzt6C9xdyRThQkA8AxU
IA==


--===============0422850667302796483==--