From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Aug 2018 18:42:45 +0000 (-0700)
Subject: rdbms: Avoid numRows() warnings for mysqli after table creation
X-Git-Tag: 1.34.0-rc.0~4449^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=d9fdc4098b5ca94397293f5140a472533c990cb7;p=lhc%2Fweb%2Fwiklou.git

rdbms: Avoid numRows() warnings for mysqli after table creation

Bug: T201900
Change-Id: Ie86a7b8e680d79ad3f9be6ca4ec260b0589e5d0e
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 3ecfca9108..57fab54936 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -367,7 +367,7 @@ abstract class DatabaseMysqlBase extends Database {
 			$res = $res->result;
 		}
 		Wikimedia\suppressWarnings();
-		$n = $this->mysqlNumRows( $res );
+		$n = $res ? $this->mysqlNumRows( $res ) : 0;
 		Wikimedia\restoreWarnings();
 
 		// Unfortunately, mysql_num_rows does not reset the last errno.