bzr commit into mysql-5.0-bugteam branch (satya.bn:2730)

[Satya B]

#At file:///home/satya/WORK/mysql/mysql-5.0-bugteam-innodb/ based on revid:satya.bn@stripped0424110350-v9cjr2w7a1mo7lej

 2730 Satya B	2009-04-24 [merge]
      merge to latest 5.0-bugteam tree
      modified:
        mysql-test/r/mysqldump.result
        mysql-test/t/mysqldump.test
        sql/sql_table.cc

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-03-10 16:53:43 +0000
+++ b/mysql-test/r/mysqldump.result	2009-04-21 09:01:13 +0000
@@ -3557,7 +3557,6 @@ DROP TABLE t1,t2;
 
 
 -- Dump completed on DATE
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # Bug #42635: mysqldump includes views that were excluded using 
 #   the --ignore-table option
@@ -3693,6 +3692,7 @@ UNLOCK TABLES;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
 SET NAMES latin1;
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # End of 5.0 tests
 #

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-03-10 16:53:43 +0000
+++ b/mysql-test/t/mysqldump.test	2009-04-21 09:01:13 +0000
@@ -1646,9 +1646,6 @@ DROP TABLE t1,t2;
 --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
 --exec $MYSQL_DUMP test
 
-# We reset concurrent_inserts value to whatever it was at the start of the test
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
-
 --echo #
 --echo # Bug #42635: mysqldump includes views that were excluded using 
 --echo #   the --ignore-table option
@@ -1681,6 +1678,9 @@ CREATE TABLE `כדשגכחךלדגכחש
 DROP TABLE `כדשגMES latin1;
 
+# We reset concurrent_inserts value to whatever it was at the start of the test
+# This line must be executed _after_ all test cases.
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 
 --echo #
 --echo # End of 5.0 tests

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2009-03-27 05:19:50 +0000
+++ b/sql/sql_table.cc	2009-04-23 17:52:39 +0000
@@ -4376,6 +4376,16 @@ bool mysql_checksum_table(THD *thd, TABL
 	{
 	  for (;;)
 	  {
+            if (thd->killed)
+            {
+              /* 
+                 we've been killed; let handler clean up, and remove the 
+                 partial current row from the recordset (embedded lib) 
+              */
+              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))