Commit 3bd21c84 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 d4a874f6 c81140f5
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
  stmt->stmt_id= thd->client_stmt_id;
  stmt->param_count= thd->client_param_count;
  stmt->field_count= 0;
  mysql->warning_count= thd->total_warn_count;

  if (thd->first_data)
  {