From d9fdc4098b5ca94397293f5140a472533c990cb7 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Aug 2018 11:42:45 -0700
Subject: [PATCH] rdbms: Avoid numRows() warnings for mysqli after table
 creation

Bug: T201900
Change-Id: Ie86a7b8e680d79ad3f9be6ca4ec260b0589e5d0e
---
 includes/libs/rdbms/database/DatabaseMysqlBase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
-- 
2.20.1