diff --git a/client/mysql.cc b/client/mysql.cc
index 6520dce076a..84f5f097f06 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1242,6 +1242,16 @@ int main(int argc,char *argv[])
 
 sig_handler mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&