bk commit into 5.0 tree (kostja:1.2521) BUG#27296

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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, 2007-07-15 13:34:35+04:00, kostja@bodhi.(none) +2 -0
  Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
  Linux Debug build (possible deadlock)"
  
  The bug is not repeatable any more.

  mysql-test/r/innodb_mysql.result@stripped, 2007-07-15 13:34:33+04:00, kostja@bodhi.(none) +4
-0
    Update test results (Bug#27296)

  mysql-test/t/innodb_mysql.test@stripped, 2007-07-15 13:34:33+04:00, kostja@bodhi.(none) +14
-0
    Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
    Linux Debug build (possible deadlock)"

diff -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-06-25 11:44:51 +04:00
+++ b/mysql-test/r/innodb_mysql.result	2007-07-15 13:34:33 +04:00
@@ -676,4 +676,8 @@ INSERT INTO t1 VALUES (1);
 switch to connection default
 SET AUTOCOMMIT=default;
 DROP TABLE t1,t2;
+drop table if exists t1;
+create table t1 (a int) engine=innodb;
+alter table t1 alter a set default 1;
+drop table t1;
 End of 5.0 tests
diff -Nrup a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
--- a/mysql-test/t/innodb_mysql.test	2007-06-25 11:44:51 +04:00
+++ b/mysql-test/t/innodb_mysql.test	2007-07-15 13:34:33 +04:00
@@ -670,5 +670,19 @@ DISCONNECT c1;
 DISCONNECT c2;
 DROP TABLE t1,t2;
 
+#
+# Bug#27296 Assertion in ALTER TABLE SET DEFAULT in Linux Debug build
+# (possible deadlock).
+#
+# The bug is applicable only to a transactoinal table.
+# Cover with tests behavior that no longer causes an
+# assertion.
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a int) engine=innodb;
+alter table t1 alter a set default 1;
+drop table t1;
 
 --echo End of 5.0 tests