Ticket #41956: 41956.2.diff

src/wp-includes/wp-db.php

@@ -1798 +1798 @@
                                 $this->insert_id = 0;
                                 return false;
                         }
-                }
-
-                // If there is an error then take note of it.
-                if ( $this->use_mysqli ) {
-                        if ( $this->dbh instanceof mysqli ) {
-                                $this->last_error = mysqli_error( $this->dbh );
+                } elseif ( 0 !== $mysql_errno ) {
+                        // If there is an error then take note of it.
+                        if ( $this->use_mysqli ) {
+                                if ( $this->dbh instanceof mysqli ) {
+                                        $this->last_error = sprintf('[code:"%d", message:"%s"]' ,$mysql_errno, mysqli_error( $this->dbh ) );
+                                } else {
+                                        $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                }
                         } else {
-                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                if ( is_resource( $this->dbh ) ) {
+                                        $this->last_error = sprintf('[code:"%d", message:"%s"]' ,$mysql_errno, mysql_error( $this->dbh ) );
+                                } else {
+                                        $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                }
                         }
-                } else {
-                        if ( is_resource( $this->dbh ) ) {
-                                $this->last_error = mysql_error( $this->dbh );
-                        } else {
-                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
-                        }
                 }
 
                 if ( $this->last_error ) {