diff --git a/cmake/Env.cmake b/cmake/Env.cmake
index 4e0d6b49d..095222d4e 100644
--- a/cmake/Env.cmake
+++ b/cmake/Env.cmake
@@ -367,8 +367,8 @@ if( ${ARCHITECTURE} STREQUAL "x86_64" )
     set(ARCH_LDFLAGS "")
     set(OCI_DEVEL_INC "${DEP_3RD_DIR}/usr/include/oracle/12.2/client64")
 elseif( ${ARCHITECTURE} STREQUAL "loongarch64" )
-	set(MARCHE_CFLAGS "-march=lp464")
-    set(MTUNE_CFLAGS "-mabi=lp64")
+	set(MARCHE_CFLAGS "-march=loongarch64")
+    set(MTUNE_CFLAGS "-mabi=lp64d")
     set(ARCH_LDFLAGS "-latomic")
 else()
     if (${OB_DISABLE_LSE})
diff --git a/deps/easy/src/io/easy_ssl.c b/deps/easy/src/io/easy_ssl.c
index 68d2a4a43..a5b33ff3a 100644
--- a/deps/easy/src/io/easy_ssl.c
+++ b/deps/easy/src/io/easy_ssl.c
@@ -451,7 +451,6 @@ static int easy_ssl_handshake(easy_connection_t *c)
 
         return EASY_OK;
     }
-#endif
 
     sslerr = SSL_get_error(c->sc->connection, n);
     easy_debug_log("SSL_get_error: %d %s errno=%d", sslerr, easy_connection_str(c), errno);
diff --git a/src/share/mysql_errno.h b/src/share/mysql_errno.h
index a45572e0f..7adb0dd32 100644
--- a/src/share/mysql_errno.h
+++ b/src/share/mysql_errno.h
@@ -888,7 +888,9 @@
 #define ER_AES_INVALID_IV 1882
 #define ER_PLUGIN_CANNOT_BE_UNINSTALLED 1883
 #define ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP 1884
+#if !defined(ER_ERROR_LAST)
 #define ER_ERROR_LAST 1884
+#endif
 #define ER_TOO_SMALL_SCALE 1885
 #define ER_TOO_SMALL_PRECISION 1886
 #define ER_OVERSIZE_NEED_RETRY 1887
@@ -925,9 +927,6 @@
 #define ER_INCORRECT_TYPE 3064
 #define ER_BOOST_GEOMETRY_INCONSISTENT_TURNS_EXCEPTION 3122
 #define ER_GIS_MAX_POINTS_IN_GEOMETRY_OVERFLOWED 3134
-#if !defined(ER_ACCOUNT_HAS_BEEN_LOCKED)
-# define ER_ACCOUNT_HAS_BEEN_LOCKED 3118
-#endif
 #define ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN 3105
 #define ER_DEPENDENT_BY_GENERATED_COLUMN 3108
 
@@ -956,9 +955,13 @@
 
 #define ER_UNSUPPORTED_FK_SET_NULL_ON_GENERATED_COLUMN 3104
 #define ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN 3105
+#if !defined(ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN)
 #define ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN 3106
+#endif
 #define ER_DEPENDENT_BY_GENERATED_COLUMN 3108
+#if !defined(ER_ACCOUNT_HAS_BEEN_LOCKED)
 #define ER_ACCOUNT_HAS_BEEN_LOCKED 3118
+#endif
 #define ER_USER_ALREADY_EXISTS 3163
 #define ER_TOO_BIG_ENUM 3504
 #define ER_TOO_LONG_SET_ENUM_VALUE 3505