revert

wangliang181230 · Nov 30, 2023 · ef61c29 · ef61c29
1 parent 1fd741a
commit ef61c29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java
@@ -101,10 +101,6 @@ public static void checkVersion(String version) throws IncompatibleVersionExcept
      * @return true: client version is above or equal version 1.5.0, false: on the contrary
      */
     public static boolean isAboveOrEqualVersion150(String version) {
-        if (StringUtils.isBlank(version)) {
-            return false;
-        }
-
         boolean isAboveOrEqualVersion150 = false;
         try {
             long clientVersion = convertVersion(version);

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLUpdateJoinExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLUpdateJoinExecutor.java
@@ -296,7 +296,7 @@ private String buildGroupBy(List<String> pkColumns,List<String> allSelectColumns
             }
         } catch (Exception e) {
             groupByPks = false;
-            logger.warn("determine group by pks or all columns error:", e);
+            logger.warn("determine group by pks or all columns error:{}",e.getMessage());
         }
         List<String> groupByColumns = groupByPks ? pkColumns : allSelectColumns;
         StringBuilder groupByStr = new StringBuilder();