Merge remote-tracking branch 'upstream/master'

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

@@ -796,7 +796,7 @@ public class SQLEvalVisitorUtils {
         if (wallConditionContext != null) {
             wallConditionContext.setConstArithmetic(true);
         }
-        
+
         if (leftValue == null || rightValue == null) {
             return false;
         }
@@ -1290,7 +1290,7 @@ public class SQLEvalVisitorUtils {
         }
 
         if (a instanceof String || b instanceof String) {
-            return ((String) a).compareTo((String) b) < 0;
+            return (castToString(a)).compareTo(castToString(b)) < 0;
         }
 
         if (a instanceof BigDecimal || b instanceof BigDecimal) {