merging fix

b102253b · unknown · 0da2a28b · b102253b
Commit b102253b authored Jan 02, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +0 -2

No files found.
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -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;