bk commit into 6.0 tree (sergefp:1.2641)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
6.0 repository of sergefp.  When sergefp does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-09 00:21:36+04:00, sergefp@stripped +1 -0
  Pushbuild failure fix: initialize thd->thd_marker for PREPARE command, too. 
  This is an extension of fix for B_G#33245.

  sql/sql_parse.cc@stripped, 2008-05-09 00:21:27+04:00, sergefp@stripped +1 -0
    Pushbuild failure fix: initialize thd->thd_marker for PREPARE command, too. 
    This is an extension of fix for B_G#33245.

diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2008-04-29 03:00:24 +04:00
+++ b/sql/sql_parse.cc	2008-05-09 00:21:27 +04:00
@@ -5526,6 +5526,7 @@ void mysql_reset_thd_for_next_command(TH
   thd->total_warn_count=0;			// Warnings for this query
   thd->rand_used= 0;
   thd->sent_row_count= thd->examined_row_count= 0;
+  thd->thd_marker.emb_on_expr_nest= NULL;
 
   /*
     Because we come here only for start of top-statements, binlog format is