jenkins-bot has submitted this change and it was merged.

Change subject: Clear previously left-over PQresult before calling 
pg_get_result()
......................................................................


Clear previously left-over PQresult before calling pg_get_result()

Bug: T52091
Change-Id: Iaa1a479b5eefcae0fc8f82b1d20e9575d609c0e9
---
M includes/db/DatabasePostgres.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index c9d7b35..64ae1c6 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -395,6 +395,9 @@
                if ( function_exists( 'mb_convert_encoding' ) ) {
                        $sql = mb_convert_encoding( $sql, 'UTF-8' );
                }
+               // Clear previously left over PQresult
+               while ( $res = pg_get_result( $this->mConn ) )
+                       pg_free_result( $res );
                if ( pg_send_query( $this->mConn, $sql ) === false ) {
                        throw new DBUnexpectedError( $this, "Unable to post new 
query to PostgreSQL\n" );
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/241497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa1a479b5eefcae0fc8f82b1d20e9575d609c0e9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yoonghm <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jjanes <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Yoonghm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to