Merge pull request #569 from yakolee/master

improve sql parser

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java

@@ -1957,6 +1957,10 @@ public class MySqlStatementParser extends SQLStatementParser {
                         break;
                     } else {
                         expr = this.exprParser.primaryRest(expr);
+                        if(lexer.token() != Token.COMMA && lexer.token() != Token.RPAREN) {
+                            expr = this.exprParser.exprRest(expr);
+                        }
+                        
                         valueExprList.add(expr);
                         if (lexer.token() == Token.COMMA) {
                             lexer.nextToken();

src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java

@@ -1725,7 +1725,12 @@ public class SQLEvalVisitorUtils {
         }
 
         if (a instanceof Integer || b instanceof Integer) {
-            return castToInteger(a).equals(castToInteger(b));
+            Integer inta = castToInteger(a);
+            Integer intb = castToInteger(b);
+            if (inta == null || intb == null) {
+                return false;
+            }
+            return inta.equals(intb);
         }
 
         if (a instanceof Short || b instanceof Short) {