bzr push into mysql-5.5 branch (mikael.ronstrom:3138 to 3139)

[Mikael Ronstrom]

 3139 Mikael Ronstrom	2011-04-20
      Fixed error in merge

    modified:
      sql/sql_prepare.cc
 3138 Mikael Ronstrom	2011-04-20
      Fixed missing change of thd_unlock_connection_data to thd_unlock_thread_count

    modified:
      sql/sql_class.cc
=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	revid:mikael.ronstrom@stripped
+++ b/sql/sql_prepare.cc	revid:mikael.ronstrom@stripped
@@ -3401,7 +3401,7 @@ Prepared_statement::execute_loop(String 
   int reprepare_attempt= 0;
 
   /* Check if we got an error when sending long data */
-  if (state == Query_arena::ERROR)
+  if (state == Query_arena::STMT_ERROR)
   {
     my_message(last_errno, last_error, MYF(0));
     return TRUE;

No bundle (reason: useless for push emails).