From: Luis Soares
Date: September 23 2011 11:44am
Subject: bzr push into mysql-trunk branch (luis.soares:3428 to 3429) Bug#13001711
List-Archive: http://lists.mysql.com/commits/141109
X-Bug: 13001711
Message-Id: <201109231144.p8NBi4qc028862@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3429 Luis Soares	2011-09-23 [merge]
      BUG#13001711
      
      Automerged mysql-5.5 into mysql-trunk.

    modified:
      sql/sql_lex.cc
 3428 Daniel Fischer	2011-09-23
      post-merge fix for wl5973 as pushed to 5.5.16

    modified:
      storage/innobase/handler/i_s.cc
=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc	2011-09-21 11:01:41 +0000
+++ b/sql/sql_lex.cc	2011-09-23 11:42:35 +0000
@@ -436,6 +436,7 @@ void lex_start(THD *thd)
 
   lex->is_lex_started= TRUE;
   lex->used_tables= 0;
+  lex->reset_slave_info.all= false;
   DBUG_VOID_RETURN;
 }
 

No bundle (reason: useless for push emails).