From 57f95d36bfd70469b2d9a6df2d9876467123df9a Mon Sep 17 00:00:00 2001
From: gaoming <gaoming@shuimuyulin.com>
Date: Fri, 1 Jul 2022 10:42:15 +0800
Subject: [PATCH] if keyring migration failed, its destructor will delete
 m_argv wasn't new

---
 sql/migrate_keyring.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sql/migrate_keyring.cc b/sql/migrate_keyring.cc
index f7e63b8f274d..c5e337551834 100644
--- a/sql/migrate_keyring.cc
+++ b/sql/migrate_keyring.cc
@@ -559,8 +559,10 @@ bool Migrate_keyring::enable_keyring_operations() {
   Standard destructor to close connection handle.
 */
 Migrate_keyring::~Migrate_keyring() {
-  delete[] m_argv;
-  m_argv = nullptr;
+  if (m_argv) {
+  	delete[] m_argv;
+  	m_argv = nullptr;
+  }
   if (mysql) {
     mysql_close(mysql);
     mysql = nullptr;