From: Mayank Prasad
Date: April 6 2012 7:03pm
Subject: bzr push into mysql-trunk branch (mayank.prasad:3850 to 3851) Bug#13738989
List-Archive: http://lists.mysql.com/commits/143420
X-Bug: 13738989
Message-Id: <201204061903.q36J3mkA008566@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3851 Mayank Prasad	2012-04-07 [merge]
      BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLD
            
      Merge : 5.5->trunk

    modified:
      libmysqld/lib_sql.cc
 3850 kevin.lewis@stripped	2012-04-06
      Code Cleanup and reorganization.
      Collect sections of ha_innobase::create into parse_table_name()
      Let normalize_table_name allocate the name from the heap
      so that it can use just the memory it needs and does not have
      to allocate more than neccessary and allocate it on the stack.
      make sure thes string buffers are always freed before exit.
      
      Approved by jimmy in http://bur03.no.oracle.com/rb/r/990/

    modified:
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0load.h
      storage/innobase/os/os0file.cc
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2012-03-13 13:16:27 +0000
+++ b/libmysqld/lib_sql.cc	2012-04-06 18:58:01 +0000
@@ -349,6 +349,8 @@ static int emb_stmt_execute(MYSQL_STMT *
     set_stmt_errmsg(stmt, net);
     DBUG_RETURN(1);
   }
+  else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT)
+           stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
   DBUG_RETURN(0);
 }
 

No bundle (reason: useless for push emails).