Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

mysql-test/t/innodb_mysql.test

@@ -740,5 +740,18 @@ SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
 set @@sort_buffer_size=default;
 
 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