bk commit into 5.0 tree (ramil:1.2477)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-20 15:37:42+05:00, ramil@stripped +1 -0
  after-merge fixup

  mysql-test/r/innodb_mysql.result@stripped, 2007-07-20 15:37:40+05:00, ramil@stripped +4 -3
    after-merge fixup

diff -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-07-20 15:23:33 +05:00
+++ b/mysql-test/r/innodb_mysql.result	2007-07-20 15:37:40 +05:00
@@ -735,6 +735,10 @@ COUNT(*)
 3072
 set @@sort_buffer_size=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;
 create table t1(a text) engine=innodb default charset=utf8;
 insert into t1 values('aaa');
 alter table t1 add index(a(1024));
@@ -746,8 +750,5 @@ t1	CREATE TABLE `t1` (
   `a` text,
   KEY `a` (`a`(255))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-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