Merge branch 'master' of https://github.com/Dinwy/node-mysql

# Conflicts:
#	lib/protocol/packets/RowDataPacket.js

Author: Dinwy

lib/protocol/packets/RowDataPacket.js

@@ -99,7 +99,12 @@ function typeCast(field, parser, timeZone, supportBigNumbers, bigNumberStrings,
       numberString = parser.parseLengthCodedString();
       return (numberString === null || (field.zeroFill && numberString[0] == "0"))
         ? numberString
+<<<<<<< HEAD
           : ((supportBigNumbers && (bigNumberStrings || (Number(numberString) > Number.MAX_SAFE_INTEGER || Number(numberString) < Number.MIN_SAFE_INTEGER)))          ? numberString
+=======
+        : ((supportBigNumbers && (bigNumberStrings || (Number(numberString) > Number.MAX_SAFE_INTEGER || Number(numberString) < Number.MIN_SAFE_INTEGER)))
+          ? numberString
+>>>>>>> 2b160b907413bcb0b33f78fddc89f8004a29cf98
           : Number(numberString));
     case Types.BIT:
       return parser.parseLengthCodedBuffer();