Merge pull request #2442 from chornyi/1.7.0

Remove item from the active queue on connection error

lib/dialects/mysql/connector-manager.js

@@ -374,7 +374,7 @@ module.exports = (function() {
 
 
   var dequeue = function(queueItem) {
   var dequeue = function(queueItem) {
     //return the item's connection to the pool
     //return the item's connection to the pool
-    if (this.pool) {
+    if (this.pool && queueItem.client) {
       this.pool.release(queueItem.client)
       this.pool.release(queueItem.client)
     }
     }
     this.activeQueue = without(this.activeQueue, queueItem)
     this.activeQueue = without(this.activeQueue, queueItem)
@@ -404,6 +404,7 @@ module.exports = (function() {
       type: queueItem.query.options.type
       type: queueItem.query.options.type
     }, function (err, connection) {
     }, function (err, connection) {
       if (err) {
       if (err) {
+        afterQuery.call(self, queueItem)
         queueItem.query.emit('error', err)
         queueItem.query.emit('error', err)
         return
         return
       }
       }