libmysql.c (mysql-connector-c-6.1.10-src) | : | libmysql.c (mysql-connector-c-6.1.11-src) | ||
---|---|---|---|---|
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. | /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. | |||
This program is free software; you can redistribute it and/or modify | This program is free software; you can redistribute it and/or modify | |||
it under the terms of the GNU General Public License as published by | it under the terms of the GNU General Public License as published by | |||
the Free Software Foundation; version 2 of the License. | the Free Software Foundation; version 2 of the License. | |||
This program is distributed in the hope that it will be useful, | This program is distributed in the hope that it will be useful, | |||
but WITHOUT ANY WARRANTY; without even the implied warranty of | but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
GNU General Public License for more details. | GNU General Public License for more details. | |||
skipping to change at line 4771 | skipping to change at line 4771 | |||
/* | /* | |||
Flush result set of the connection. If it does not belong | Flush result set of the connection. If it does not belong | |||
to this statement, set a warning. | to this statement, set a warning. | |||
*/ | */ | |||
(*mysql->methods->flush_use_result)(mysql, TRUE); | (*mysql->methods->flush_use_result)(mysql, TRUE); | |||
if (mysql->unbuffered_fetch_owner) | if (mysql->unbuffered_fetch_owner) | |||
*mysql->unbuffered_fetch_owner= TRUE; | *mysql->unbuffered_fetch_owner= TRUE; | |||
mysql->status= MYSQL_STATUS_READY; | mysql->status= MYSQL_STATUS_READY; | |||
} | } | |||
int4store(buff, stmt->stmt_id); | int4store(buff, stmt->stmt_id); | |||
if ((rc= stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt))) | /* | |||
{ | If stmt_command failed, it would have already raised | |||
set_stmt_errmsg(stmt, &mysql->net); | error using set_mysql_error. Caller should use | |||
} | mysql_error() or mysql_errno() to find out details. | |||
Memory allocated for stmt will be released regardless | ||||
of the error. | ||||
*/ | ||||
rc= stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt); | ||||
} | } | |||
} | } | |||
my_free(stmt->extension); | my_free(stmt->extension); | |||
my_free(stmt); | my_free(stmt); | |||
DBUG_RETURN(MY_TEST(rc)); | DBUG_RETURN(MY_TEST(rc)); | |||
} | } | |||
/* | /* | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 9 lines changed or added |