Ticket #40037: 40037.2.diff

src/wp-includes/wp-db.php

@@ -3507 +3507 @@
          * @return null|string Null on failure, version number on success.
          */
         public function db_version() {
-                if ( $this->use_mysqli ) {
-                        $server_info = mysqli_get_server_info( $this->dbh );
-                } else {
-                        $server_info = mysql_get_server_info( $this->dbh );
-                }
-                return preg_replace( '/[^0-9.].*/', '', $server_info );
+                return preg_replace( '/[^0-9.].*/', '', $this->db_server_info() );
+        }
+
+        /**
+         * Retrieves full MySQL server information.
+         *
+         * @since 5.0.0
+         *
+         * @return null|string Null on failure, server info on success.
+         */
+        public function db_server_info() {
+                return $this->use_mysqli ?
+                        mysqli_get_server_info( $this->dbh ) :
+                        mysql_get_server_info( $this->dbh );
         }
 }

tests/phpunit/tests/db/charset.php

@@ -29 +29 @@
 
                 self::$_wpdb = new wpdb_exposed_methods_for_testing();
 
-                if ( self::$_wpdb->use_mysqli ) {
-                        self::$server_info = mysqli_get_server_info( self::$_wpdb->dbh );
-                } else {
-                        self::$server_info = mysql_get_server_info( self::$_wpdb->dbh );
-                }
+                self::$server_info = self::$_wpdb->db_server_info();
         }
 
         /**