List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:October 25 2010 3:02pm
Subject:bzr commit into mysql-next-mr-merge branch (tor.didriksen:3235)
View as plain text  
#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; 
   }
 


Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20101025150232-usqd3ucv65wa6pxl.bundle
Thread
bzr commit into mysql-next-mr-merge branch (tor.didriksen:3235) Tor Didriksen25 Oct