Merge pull request #1438 from kneemer/master

Update how the ECONNRESET error is caught when connection already closing

lib/connection.js

@@ -174,7 +174,7 @@ class Connection extends EventEmitter {
       this.connectTimeout = null;
     }
     // Do not throw an error when a connection ends with a RST,ACK packet
-    if (err.errno === 'ECONNRESET' && this._closing) {
+    if (err.code === 'ECONNRESET' && this._closing) {
       return;
     }
     this._handleFatalError(err);

test/integration/connection/test-connection-reset-while-closing.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const assert = require('assert');
+const common = require('../../common')
+
+const error = new Error('read ECONNRESET');
+error.code = 'ECONNRESET'
+error.errno = -54
+error.syscall = 'read';
+
+const connection = common.createConnection();
+
+// Test that we ignore a ECONNRESET error if the connection
+// is already closing, we close and then emit the error
+connection.query(`select 1`, (err, rows) => {
+  assert.equal(rows[0]['1'], 1);
+  connection.close();
+  connection.stream.emit('error', error);
+});
+
+process.on('uncaughtException', err => {
+  assert.notEqual(err.code, 'ECONNRESET')
+});