bzr commit into mysql-6.0 branch (kostja:2724) Bug#33146

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.0-runtime/

 2724 Konstantin Osipov	2008-10-08
      Bug #33146 CHECKSUM TABLE is not interruptable by KILL QUERY statement
      
      Check for thd->killed in CHECKSUM loop.
modified:
  sql/sql_table.cc

per-file messages:
  sql/sql_table.cc
    Check for thd->killed in CHECKSUM loop.
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-10-02 14:16:01 +0000
+++ b/sql/sql_table.cc	2008-10-07 20:48:00 +0000
@@ -7563,6 +7563,12 @@ bool mysql_checksum_table(THD *thd, TABL
 	{
 	  for (;;)
 	  {
+            if (thd->killed)
+            {
+              t->file->ha_rnd_end();
+              thd->protocol->remove_last_row();
+              goto err;
+            }
 	    ha_checksum row_crc= 0;
             int error= t->file->rnd_next(t->record[0]);
             if (unlikely(error))