handle wpdb error ourselves, instead of waiting for dead_db()

diff --git a/php/wp-settings-cli.php b/php/wp-settings-cli.php
index dd64be7..12321c1 100644 (file)
--- a/php/wp-settings-cli.php
+++ b/php/wp-settings-cli.php
@@ -61,6 +61,10 @@ Utils\replace_wp_die_handler();
 // Include the wpdb class and, if present, a db.php database drop-in.
 require_wp_db();
 
+// WP-CLI: Handle db error ourselves, instead of waiting for dead_db()
+if ( !empty( $wpdb->error ) )
+       wp_die( $wpdb->error );
+
 // Set the database table prefix and the format specifiers for database table columns.
 $GLOBALS['table_prefix'] = $table_prefix;
 wp_set_wpdb_vars();