Merge 5.5 into 10.1

MariaDB · Oct 29, 2019 · 9ed4d06 · 9ed4d06
2 parents 2cc360b + 84088d9
commit 9ed4d06
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1401,12 +1401,21 @@ sig_handler handle_sigint(int sig)
   char kill_buffer[40];
   MYSQL *kill_mysql= NULL;
 
-  /* terminate if no query being executed, or we already tried interrupting */
-  if (!executing_query || (interrupted_query == 2))
+  /* Terminate if we already tried interrupting. */
+  if (interrupted_query == 2)
   {
     tee_fprintf(stdout, "Ctrl-C -- exit!\n");
     goto err;
   }
+  /* If no query being executed, don't exit. */
+  if (!executing_query)
+  {
+    tee_fprintf(stdout, "Ctrl-C\n");
+    rl_on_new_line(); // Regenerate the prompt on a newline
+    rl_replace_line("", 0); // Clear the previous text
+    rl_redisplay();
+    return;
+  }
 
   kill_mysql= mysql_init(kill_mysql);
   if (!do_connect(kill_mysql,current_host, current_user, opt_password, "", 0))

diff --git a/storage/innobase/.clang-format b/storage/innobase/.clang-format
@@ -0,0 +1,11 @@
+UseTab: Always
+TabWidth: 8
+IndentWidth: 8
+ContinuationIndentWidth: 8
+BreakBeforeBinaryOperators: All
+PointerAlignment: Left
+BreakBeforeBraces: Custom
+ColumnLimit: 79
+BraceWrapping:
+  AfterFunction: true
+AccessModifierOffset: -8