Merge 10.2 into 10.3

1 files changed, 3 insertions, 0 deletions

diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp
index c194a4dc330..4e084400ed6 100644
--- a/storage/mroonga/ha_mroonga.cpp
+++ b/storage/mroonga/ha_mroonga.cpp
@@ -9005,10 +9005,12 @@ bool ha_mroonga::is_foreign_key_field(const char *table_name,
 
   grn_obj *range = grn_ctx_at(ctx, grn_obj_get_range(ctx, column));
   if (!range) {
+    grn_obj_unlink(ctx, column);
     DBUG_RETURN(false);
   }
 
   if (!mrn::grn::is_table(range)) {
+    grn_obj_unlink(ctx, column);
     DBUG_RETURN(false);
   }
 
@@ -9022,6 +9024,7 @@ bool ha_mroonga::is_foreign_key_field(const char *table_name,
     DBUG_RETURN(true);
   }
 
+  grn_obj_unlink(ctx, column);
   DBUG_RETURN(false);
 }