Commit 3bd21c84 authored by unknown's avatar unknown

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

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


libmysqld/lib_sql.cc:
  merging
parents d4a874f6 c81140f5
...@@ -198,6 +198,7 @@ static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) ...@@ -198,6 +198,7 @@ static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
stmt->stmt_id= thd->client_stmt_id; stmt->stmt_id= thd->client_stmt_id;
stmt->param_count= thd->client_param_count; stmt->param_count= thd->client_param_count;
stmt->field_count= 0; stmt->field_count= 0;
mysql->warning_count= thd->total_warn_count;
if (thd->first_data) if (thd->first_data)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment