Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

mysql-test/t/alter_table.test

@@ -604,8 +604,6 @@ alter table t1 alter column mycol set default 0;
 desc t1;
 drop table t1;
 
-#
-
 #
 # Bug#25262 Auto Increment lost when changing Engine type
 #