bzr commit into mysql-6.0 branch (magne.mahre:2718)

[Magne Mahre]

#At file:///home/mm136784/z/mysql-6.0-runtime-test-21840/

 2718 Magne Mahre	2008-10-06
      Added test case for http://bugs.mysql.com/bug.php?id=21840
modified:
  mysql-test/r/innodb_mysql.result
  mysql-test/t/innodb_mysql.test

=== modified file 'mysql-test/r/innodb_mysql.result'

=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2008-08-11 19:37:53 +0000
+++ b/mysql-test/r/innodb_mysql.result	2008-10-06 10:45:22 +0000
@@ -1668,3 +1668,9 @@
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	index	NULL	a	10	NULL	#	Using where; Using index
 drop table t1, t2;
+set autocommit=0;
+create temporary table t1 (a int) engine=innodb;
+insert into t1 (a) values (1);
+rollback;
+show warnings;
+Level	Code	Message

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2008-05-07 05:58:21 +0000
+++ b/mysql-test/t/innodb_mysql.test	2008-10-06 10:45:22 +0000
@@ -29,3 +29,11 @@
 explain select a from t2 where a=b;
 drop table t1, t2;
 
+#
+# BUG #21840: Spurious ER_WARNING_NOT_COMPLETE_ROLLBACK for transactional tables
+#
+set autocommit=0;
+create temporary table t1 (a int) engine=innodb;
+insert into t1 (a) values (1);
+rollback;
+show warnings;