Commit 84779aef authored by unknown's avatar unknown

addition to fixes about #4700, 4701


libmysqld/lib_sql.cc:
  Comment added
sql/sql_prepare.cc:
  Necessary line added to emb_insert_params_with_log
parent 205703ff
...@@ -108,6 +108,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, ...@@ -108,6 +108,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if (!skip_check) if (!skip_check)
result= thd->net.last_errno ? -1 : 0; result= thd->net.last_errno ? -1 : 0;
/*
If mysql->field_count is set it means the parsing of the query was OK
and metadata was returned (see Protocol::send_fields).
In this case we postpone the error to be returned in mysql_stmt_store_result
(see emb_read_rows) to behave just as standalone server.
*/
if (!mysql->field_count) if (!mysql->field_count)
embedded_get_error(mysql); embedded_get_error(mysql);
mysql->server_status= thd->server_status; mysql->server_status= thd->server_status;
......
...@@ -737,6 +737,7 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query) ...@@ -737,6 +737,7 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query)
else else
{ {
uchar *buff= (uchar*)client_param->buffer; uchar *buff= (uchar*)client_param->buffer;
param->unsigned_flag= client_param->is_unsigned;
param->set_param_func(param, &buff, param->set_param_func(param, &buff,
client_param->length ? client_param->length ?
*client_param->length : *client_param->length :
......
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