Commit 1c48d723 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/common/my41-common 

into  mysql.com:/d2/hf/common/my50-common


libmysqld/lib_sql.cc:
  merging
parents 6de3acec 8b8f1890

libmysqld/lib_sql.cc

+4 −0
Original line number Diff line number Diff line
@@ -306,7 +306,11 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) 
{

  MYSQL_DATA *data;

  if (!(data= emb_read_rows(stmt->mysql, 0, 0)))

  {

    set_stmt_errmsg(stmt, stmt->mysql->net.last_error,

                    stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);

    return 1;

  }

  stmt->result= *data;

  my_free((char *) data, MYF(0));

  set_stmt_errmsg(stmt, stmt->mysql->net.last_error,