Commit e7130631 authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

merging fix

parent 56155d83

libmysqld/lib_sql.cc

+0 −2
Original line number Diff line number Diff line
@@ -250,8 +250,6 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) 
  MYSQL_DATA *data;

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

  {

    stmt->result= *data;

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

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

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

    return 1;