bzr push into mysql-trunk branch (tor.didriksen:3357 to 3358) Bug#11766327

[Tor Didriksen]

 3358 Tor Didriksen	2011-05-03
      BUG#11766327 post-push fix: build break with optimized/-DMYSQL_MAINTAINER_MODE=1

    modified:
      sql/sql_select.cc
 3357 Vasil Dimov	2011-05-02 [merge]
      Merge mysql-trunk-innodb -> mysql-trunk

    modified:
      storage/innobase/trx/trx0rec.c
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-05-02 11:51:41 +0000
+++ b/sql/sql_select.cc	2011-05-03 06:46:06 +0000
@@ -11579,7 +11579,7 @@ bool JOIN_TAB::and_with_jt_and_sel_condi
 */
 bool JOIN_TAB::and_with_condition(Item *add_cond, uint line)
 {
-  Item *old_cond= m_condition;
+  Item *old_cond __attribute__((unused))= m_condition;
   if (and_conditions(&m_condition, add_cond))
     return true;
   DBUG_PRINT("info", ("JOIN_TAB::m_condition extended. Change %p -> %p "

No bundle (reason: useless for push emails).