Fixed #33715 -- Allowed keyboard interrupt to abort queries in MySQL dbshell.

1 files changed, 12 insertions, 0 deletions

diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py
index 0c09a2ca1e..6aa11b2e1f 100644
--- a/django/db/backends/mysql/client.py
+++ b/django/db/backends/mysql/client.py
@@ -1,3 +1,5 @@
+import signal
+
 from django.db.backends.base.client import BaseDatabaseClient
 
 
@@ -58,3 +60,13 @@ class DatabaseClient(BaseDatabaseClient):
             args += [database]
         args.extend(parameters)
         return args, env
+
+    def runshell(self, parameters):
+        sigint_handler = signal.getsignal(signal.SIGINT)
+        try:
+            # Allow SIGINT to pass to mysql to abort queries.
+            signal.signal(signal.SIGINT, signal.SIG_IGN)
+            super().runshell(parameters)
+        finally:
+            # Restore the original SIGINT handler.
+            signal.signal(signal.SIGINT, sigint_handler)