Ticket #33926: 33926.diff

tests/phpunit/tests/db.php

@@ -57 +57 @@
         public function test_db_reconnect() {
                 global $wpdb;
 
-                $var = $wpdb->get_var( "SELECT ID FROM $wpdb->users LIMIT 1" );
-                $this->assertGreaterThan( 0, $var );
+                $connection = $wpdb->get_var( "SELECT CONNECTION_ID()" );
+                $this->assertGreaterThan( 0, $connection );
 
                 if ( $wpdb->use_mysqli ) {
                         mysqli_close( $wpdb->dbh );
@@ -65 +65 @@
                 } else {
                         mysql_close( $wpdb->dbh );
                 }
-                unset( $wpdb->dbh );
+                $wpdb->dbh = null;
 
-                $var = $wpdb->get_var( "SELECT ID FROM $wpdb->users LIMIT 1" );
-                $this->assertGreaterThan( 0, $var );
+                $newconnection = $wpdb->get_var( "SELECT CONNECTION_ID()" );
+                $this->assertGreaterThan( 0, $newconnection );
+
+                $this->assertNotEquals( $connection, $newconnection );
         }
 
         /**