mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
manual merge, bug #2247
This commit is contained in:
@ -2010,6 +2010,7 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
|
||||
set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
stmt->affected_rows= mysql->affected_rows;
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
@ -2106,7 +2107,7 @@ ulong STDCALL mysql_param_count(MYSQL_STMT * stmt)
|
||||
|
||||
my_ulonglong STDCALL mysql_stmt_affected_rows(MYSQL_STMT *stmt)
|
||||
{
|
||||
return stmt->mysql->last_used_con->affected_rows;
|
||||
return stmt->affected_rows;
|
||||
}
|
||||
|
||||
|
||||
@ -3173,6 +3174,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
mysql->affected_rows= result->row_count= result->data->rows;
|
||||
stmt->affected_rows= result->row_count;
|
||||
result->data_cursor= result->data->data;
|
||||
result->fields= stmt->fields;
|
||||
result->field_count= stmt->field_count;
|
||||
|
Reference in New Issue
Block a user