From: Tor Didriksen
Date: October 25 2010 3:02pm
Subject: bzr commit into mysql-next-mr-merge branch (tor.didriksen:3235)
List-Archive: http://lists.mysql.com/commits/121829
Message-Id: <20101025150250.128DF3723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3443839721672558451=="

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

#At file:///export/home/didrik/repo/next-mr-merge/ based on revid:tor.didriksen@stripped

 3235 Tor Didriksen	2010-10-25
      Fix broken DBG build on misc. platforms:
      error: suggest a space before ';' or explicit braces around empty body in 'for' statement
     @ sql/sql_lex.h
        Use explicit empty {} rather than just a ';'

    modified:
      sql/sql_lex.h
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-10-21 12:18:25 +0000
+++ b/sql/sql_lex.h	2010-10-25 15:02:32 +0000
@@ -760,10 +760,11 @@ public:
   st_select_lex* outer_select();
   st_select_lex* next_select() { return (st_select_lex*) next; }
 
-  inline st_select_lex* last_select() 
+  st_select_lex* last_select() 
   { 
     st_select_lex* mylast= this;
-    for (; mylast->next_select(); mylast= mylast->next_select());
+    for (; mylast->next_select(); mylast= mylast->next_select())
+    {}
     return mylast; 
   }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   usqd3ucv65wa6pxl
# target_branch: file:///export/home/didrik/repo/next-mr-merge/
# testament_sha1: 1e2e227dc96bf84fa625eae973eea2b417e29da6
# timestamp: 2010-10-25 17:02:49 +0200
# source_branch: file:///export/home/didrik/repo/trunk-merge/
# base_revision_id: tor.didriksen@stripped\
#   qpu249f6jvlrsl19
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYgS7WwAAazfgEAQUPP//1eA
BgC////6UAQNeBtTGujQGGREBTZMpp6J7QmptT1NijQPUYgAamqaaZDTQ8piHqZBpgE0aMamgBom
gASn6iemphGTQA0GgA9QOYAAAAAAAAAAEkkyAGgTTU9NCnlTzSm0wo0epo08oXBNTl/lzz9Q52ub
XMgYx0xA511PzvK+1jZxCgDDlqm5UzbuMzMmbysttF672KMWatHiUB8UxTHdvRzR7uDIbT7MRQ9Z
Gzf2qKan7WiCTZJxdsu0zlUInEcpoKC27eXSHmEVTkW1qdL5Lksr/ddhQ790lSRUkRRjEjXK9Lq3
enUJFKcJZN7jrRSAoeCXiEie+YkgUC4ywQuTIUTLjS6SmWV8Ik679Oi9j+65RSeXam+yw19FSs92
JGkjx3Gkitn8HOFjraIaq+ixyD8qLkFL+GFkgS1lVKgX8ypTPJ3QFgSI1vKpoX3rcK4ouY0Yqloj
WrFKecx+YqEBT2SIOtV+ciwO4JtxSQVGN8uZJafC9bhQMcTnmED7LxBYNuFopCqBtoFcQYJqFIlQ
FNcpGhrk2xCsi5DFLHpvYWik9x6TL1uq3Mo6lfqU6ElnvgwgUZCpnK8kwLRMnZL65ThIWeImJlq5
bkew7lPQG+sTchUbn2FqwIoieQCCFISMcuAvG3vGqVwW1as6sA8SH40CInHloDbbUCypCgC2EWeD
AYQoFOBruiyBxP7wvZkjUlNRojwmvui+2lF14aEznyvy5HTpcrjNZ9ibwniu5jZGfgdprF5Kvib/
NteCczJH1SI5BKKV2ufHDCTcfYTrJWtpVFCc9Wj1ZgSaXJGxMhYl+2uNYRWxqdEqmzkllGtUQ0B+
zNqmGgXPZgp2mB+GmWiT3HH2duC76DqmSMd57Jld9N9Es2O27aBo1QYiiZKpQxWm0augJ4yVkhxY
Q6QhUDpH6oCqtC4xOEgPEBrjbMkx4og41NAHVPdgDHy0fFROZl6fIeuyRJQ4mBY4IeZnYIz/fbF+
Qd/iG8d/r8mr+y2UxN55h1BfyGrNwCpKty6vR7q3pRjFOIpDKgK7BTHXLhuV2AiLbKaWfgFRa/VD
bBwjERVAq4TDQ+KzBmhEDatrQFw7whTnVSJ7JlYW0KHq28FbMHpcoFHxK7okP+EhwSI7nKuFlCJ8
GYJCG37qHEpzmnYmXMXb2VYsEyVGisVq10dWyQ5NoySa90ER5vJT6dgUyubz31Sx32U9E1ANvupx
NofNYfqCyzTM0koNpFUrLqsl+Pw1OmArJHuULiDbgmc0wM2j8S86pw/m6Ej5HjMMM+6c0kHNybuy
rFEvGd9awtCVlH+lzXFGWmgqOXWFz/vqL18bOArlsEFwXITKfGAoLATgIZYucdQ1nJfA1EH4fxdy
RThQkIgS7Ww=


--===============3443839721672558451==--