From 6cad27efcd576c095ec3e2e6764070a0211bc217 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 28 Aug 2019 03:09:52 +0000
Subject: [PATCH] Site Health: Standardize on `SELECT VERSION()` query for
 checking the database server version, due to the MariaDB version declaration
 potentially causing issues in production environments.

Partially reverts [45691].

Props Clorith.
Fixes #47738.
Built from https://develop.svn.wordpress.org/trunk@45904


git-svn-id: http://core.svn.wordpress.org/trunk@45715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-debug-data.php  |  2 +-
 wp-admin/includes/class-wp-site-health.php | 18 ++++++++----------
 wp-includes/version.php                    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php
index 674ea4b464..f3ecdca9f2 100644
--- a/wp-admin/includes/class-wp-debug-data.php
+++ b/wp-admin/includes/class-wp-debug-data.php
@@ -719,7 +719,7 @@ class WP_Debug_Data {
 			$extension = null;
 		}
 
-		$server = $wpdb->db_version();
+		$server = $wpdb->get_var( 'SELECT VERSION()' );
 
 		if ( isset( $wpdb->use_mysqli ) && $wpdb->use_mysqli ) {
 			$client_version = $wpdb->dbh->client_info;
diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php
index 01f97959c5..c759effd83 100644
--- a/wp-admin/includes/class-wp-site-health.php
+++ b/wp-admin/includes/class-wp-site-health.php
@@ -132,18 +132,16 @@ class WP_Site_Health {
 	private function prepare_sql_data() {
 		global $wpdb;
 
-		if ( method_exists( $wpdb, 'db_version' ) ) {
-			if ( $wpdb->use_mysqli ) {
-				// phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysqli_get_server_info
-				$mysql_server_type = mysqli_get_server_info( $wpdb->dbh );
-			} else {
-				// phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysql_get_server_info
-				$mysql_server_type = mysql_get_server_info( $wpdb->dbh );
-			}
-
-			$this->mysql_server_version = $wpdb->db_version();
+		if ( $wpdb->use_mysqli ) {
+			// phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysqli_get_server_info
+			$mysql_server_type = mysqli_get_server_info( $wpdb->dbh );
+		} else {
+			// phpcs:ignore WordPress.DB.RestrictedFunctions.mysql_mysql_get_server_info
+			$mysql_server_type = mysql_get_server_info( $wpdb->dbh );
 		}
 
+		$this->mysql_server_version = $wpdb->get_var( 'SELECT VERSION()' );
+
 		$this->health_check_mysql_rec_version = '5.6';
 
 		if ( stristr( $mysql_server_type, 'mariadb' ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ce2bad563..f75c25956c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45903';
+$wp_version = '5.3-alpha-45904';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.