From 9091d5d46858e1baa22b8053e6d2598d2e505784 Mon Sep 17 00:00:00 2001
From: Shamasis Bhattacharya <mail@shamasis.net>
Date: Fri, 1 Jan 2016 15:15:20 +0530
Subject: [PATCH] Upgraded sails-mysql to pm.5 which removes string
 manipulation from adapter and moves work to wl-sequel for junction tables

+ also fixed issue with criteria less exec queries failing on deferred.
---
 package.json | 2 +-
 waterline    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c77894a..1ccbcff 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "lodash": "3.5.0",
     "mysql": "2.6.2",
-    "sails-mysql": "git+https://github.com/postmanlabs/sails-mysql.git#v0.10.12-postman.4"
+    "sails-mysql": "git+https://github.com/postmanlabs/sails-mysql.git#v0.10.12-postman.5"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
diff --git a/waterline b/waterline
index eb6bfc7..8146800 160000
--- a/waterline
+++ b/waterline
@@ -1 +1 @@
-Subproject commit eb6bfc781d8b893920f11723727ca1a64f522f01
+Subproject commit 81468000ac72af3ac3a841b404a0ad2d120ec1d8