diff --git a/src/gausskernel/optimizer/plan/createplan.cpp b/src/gausskernel/optimizer/plan/createplan.cpp
index 9678c6c39289e2f17ad289941729bac8c0d332d7..186cfb588d8158c39c54ab5fa1a4b4b448497d27 100644
--- a/src/gausskernel/optimizer/plan/createplan.cpp
+++ b/src/gausskernel/optimizer/plan/createplan.cpp
@@ -5859,8 +5859,10 @@ ForeignScan* make_foreignscan(
     plan->righttree = NULL;
     plan->exec_type = type;
     plan->distributed_keys = NIL;
+#ifdef ENABLE_MULTIPLE_NODES
     plan->distributed_keys =
         lappend(plan->distributed_keys, makeVar(0, InvalidAttrNumber, InvalidOid, -1, InvalidOid, 0));
+#endif
     node->scan.scanrelid = scanrelid;
     node->fdw_exprs = fdw_exprs;
     node->fdw_private = fdw_private;
diff --git a/src/gausskernel/process/tcop/utility.cpp b/src/gausskernel/process/tcop/utility.cpp
index 0524a4d4655c1b1d95b0e871a7b6b960ec537766..9bff438869b358cb3da096c39d85ce66da311175 100755
--- a/src/gausskernel/process/tcop/utility.cpp
+++ b/src/gausskernel/process/tcop/utility.cpp
@@ -8504,7 +8504,8 @@ bool DropExtensionIsSupported(const char* query_string)
 {
     char* lower_string = lowerstr(query_string);
 
-    if (strstr(lower_string, "drop") && (strstr(lower_string, "postgis") || strstr(lower_string, "packages"))) {
+    if (strstr(lower_string, "drop") && (strstr(lower_string, "postgis") || strstr(lower_string, "packages") || 
+        strstr(lower_string, "mysql_fdw") || strstr(lower_string, "oracle_fdw"))) {
         pfree_ext(lower_string);
         return true;
     } else {