bk commit into 5.0 tree (tnurnberg:1.2589) BUG#28141

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-04 08:54:47+01:00, tnurnberg@stripped +3 -0
  Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutdown)
  
  If a thread is killed in the server, we throw "shutdown" only if one is actually in
  progress; otherwise, we throw "query interrupted".
  
  Control-C in the mysql command-line client is "incremental" now.
  First Control-C sends KILL QUERY (when connected to 5.0+ server, otherwise, see next)
  Next  Control-C sends KILL CONNECTION
  Next  Control-C aborts client.
  
  As the first two steps only pertain to an existing query,
  Control-C will abort the client right away if no query is running.
  
  client will give more detailed/consistent feedback on Control-C now.

  client/mysql.cc@stripped, 2008-03-04 08:54:45+01:00, tnurnberg@stripped +18 -3
    Extends Control-C handling; enhances up feedback to user.
    
    On 5.0+ servers, we try to be nice and send KILL QUERY first
    if Control-C is pressed in the command-line client, but if
    that doesn't work, we now give the user the opportunity to
    send KILL CONNECTION with another Control-C (and to kill the
    client with another Control-C if that somehow doesn't work
    either).

  sql/records.cc@stripped, 2008-03-04 08:54:45+01:00, tnurnberg@stripped +8 -12
    make error messages on KILL uniform for rr_*()
    by folding that handling into rr_handle_error()

  sql/sql_class.h@stripped, 2008-03-04 08:54:45+01:00, tnurnberg@stripped +6 -0
    Only throw "shutdown" when we have one flagged as being in progress;
    otherwise, throw "query interrupted" as it's likely to be "KILL CONNECTION"
    or related.

diff -Nrup a/client/mysql.cc b/client/mysql.cc
--- a/client/mysql.cc	2007-11-19 14:13:59 +01:00
+++ b/client/mysql.cc	2008-03-04 08:54:45 +01:00
@@ -513,18 +513,33 @@ sig_handler mysql_sigint(int sig)
   signal(SIGINT, mysql_sigint);
 
   /* terminate if no query being executed, or we already tried interrupting */
-  if (!executing_query || interrupted_query++)
+  if (!executing_query || (interrupted_query == 2))
+  {
+    tee_fprintf(stdout, "Ctrl-C - exit\n");
     mysql_end(sig);
+  }
 
   kill_mysql= mysql_init(kill_mysql);
   if (!mysql_real_connect(kill_mysql,current_host, current_user, opt_password,
                           "", opt_mysql_port, opt_mysql_unix_port,0))
+  {
+    tee_fprintf(stdout, "Ctrl-C - sorry, cannot connect to server to kill query, giving up ...\n");
     mysql_end(sig);
+  }
+
+  interrupted_query++;
+
+  /* mysqld < 5 does not understand KILL QUERY, skip to KILL CONNECTION */
+  if ((interrupted_query == 1) && (mysql_get_server_version(&mysql) < 50000))
+    interrupted_query= 2;
+
   /* kill_buffer is always big enough because max length of %lu is 15 */
-  sprintf(kill_buffer, "KILL /*!50000 QUERY */ %lu", mysql_thread_id(&mysql));
+  sprintf(kill_buffer, "KILL %s%lu",
+          (interrupted_query == 1) ? "QUERY " : "",
+          mysql_thread_id(&mysql));
+  tee_fprintf(stdout, "Ctrl-C - sending \"%s\" to server ...\n", kill_buffer);
   mysql_real_query(kill_mysql, kill_buffer, strlen(kill_buffer));
   mysql_close(kill_mysql);
-  tee_fprintf(stdout, "Query aborted by Ctrl+C\n");
 }
 
 sig_handler mysql_end(int sig)
diff -Nrup a/sql/records.cc b/sql/records.cc
--- a/sql/records.cc	2006-12-30 21:02:07 +01:00
+++ b/sql/records.cc	2008-03-04 08:54:45 +01:00
@@ -203,6 +203,12 @@ void end_read_record(READ_RECORD *info)
 
 static int rr_handle_error(READ_RECORD *info, int error)
 {
+  if (info->thd->killed)
+  {
+    info->thd->send_kill_message();
+    return 1;
+  }
+
   if (error == HA_ERR_END_OF_FILE)
     error= -1;
   else
@@ -223,12 +229,7 @@ static int rr_quick(READ_RECORD *info)
   int tmp;
   while ((tmp= info->select->quick->get_next()))
   {
-    if (info->thd->killed)
-    {
-      my_error(ER_SERVER_SHUTDOWN, MYF(0));
-      return 1;
-    }
-    if (tmp != HA_ERR_RECORD_DELETED)
+    if (info->thd->killed || (tmp != HA_ERR_RECORD_DELETED))
     {
       tmp= rr_handle_error(info, tmp);
       break;
@@ -294,16 +295,11 @@ int rr_sequential(READ_RECORD *info)
   int tmp;
   while ((tmp=info->file->rnd_next(info->record)))
   {
-    if (info->thd->killed)
-    {
-      info->thd->send_kill_message();
-      return 1;
-    }
     /*
       rnd_next can return RECORD_DELETED for MyISAM when one thread is
       reading and another deleting without locks.
     */
-    if (tmp != HA_ERR_RECORD_DELETED)
+    if (info->thd->killed || (tmp != HA_ERR_RECORD_DELETED))
     {
       tmp= rr_handle_error(info, tmp);
       break;
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2007-11-19 22:06:01 +01:00
+++ b/sql/sql_class.h	2008-03-04 08:54:45 +01:00
@@ -44,6 +44,8 @@ extern char internal_table_name[2];
 extern char empty_c_string[1];
 extern const char **errmesg;
 
+extern bool volatile shutdown_in_progress;
+
 #define TC_LOG_PAGE_SIZE   8192
 #define TC_LOG_MIN_SIZE    (3*TC_LOG_PAGE_SIZE)
 
@@ -1760,7 +1762,11 @@ public:
   {
     int err= killed_errno();
     if (err)
+    {
+      if ((err == KILL_CONNECTION) && !shutdown_in_progress)
+        err = KILL_QUERY;
       my_message(err, ER(err), MYF(0));
+    }
   }
   /* return TRUE if we will abort query if we make a warning now */
   inline bool really_abort_on_warning()