From: Tor Didriksen
Date: October 26 2010 7:09am
Subject: bzr push into mysql-next-mr-merge branch (tor.didriksen:3237 to 3238)
List-Archive: http://lists.mysql.com/commits/121894
Message-Id: <20101026070944.7E748373D@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3238 Tor Didriksen	2010-10-26
      Fix broken DBG build on SuSE linux and debian:
      
      error: suggest a space before ';' or explicit braces around empty body in 'for' statement 
     @ sql/sql_select.cc
        s/;/{}/

    modified:
      sql/sql_select.cc
 3237 Tor Didriksen	2010-10-26 [merge]
      NULL merge from trunk-merge

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-10-21 09:49:16 +0000
+++ b/sql/sql_select.cc	2010-10-26 07:09:29 +0000
@@ -3768,7 +3768,8 @@ bool convert_subquery_to_semijoin(JOIN *
     NOTE: We actually insert them at the front! That's because the order is
           reversed in this list.
   */
-  for (tl= parent_lex->leaf_tables; tl->next_leaf; tl= tl->next_leaf);
+  for (tl= parent_lex->leaf_tables; tl->next_leaf; tl= tl->next_leaf)
+  {}
   tl->next_leaf= subq_lex->leaf_tables;
   last_leaf= tl;
 
@@ -3777,7 +3778,8 @@ bool convert_subquery_to_semijoin(JOIN *
     (a theory: a next_local chain always starts with ::leaf_tables
      because view's tables are inserted after the view)
   */
-  for (tl= parent_lex->leaf_tables; tl->next_local; tl= tl->next_local);
+  for (tl= parent_lex->leaf_tables; tl->next_local; tl= tl->next_local)
+  {}
   tl->next_local= subq_lex->leaf_tables;
 
   /* A theory: no need to re-connect the next_global chain */
@@ -4356,7 +4358,8 @@ int pull_out_semijoin_tables(JOIN *join)
       {
         List_iterator<TABLE_LIST> li(*upper_join_list);
         /* Find the sj_nest in the list. */
-        while (sj_nest != li++);
+        while (sj_nest != li++)
+        {}
         li.remove();
         /* Also remove it from the list of SJ-nests: */
         sj_list_it.remove();

No bundle (reason: useless for push emails).