Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup


mysql-test/r/rename.result:
  Manual merge.
mysql-test/t/rename.test:
  Manual merge.

mysql-test/r/rename.result

@@ -54,6 +54,7 @@ Tables_in_test
 t2
 t4
 drop table t2, t4;
+End of 4.1 tests
 create table t1(f1 int);
 create view v1 as select * from t1;
 alter table v1 rename to v2;
@@ -64,3 +65,4 @@ rename table v2 to v1;
 ERROR 42S01: Table 'v1' already exists
 drop view v1;
 drop table t1;
+End of 5.0 tests

mysql-test/t/rename.test

@@ -72,6 +72,10 @@ disconnect con2;
 disconnect con1;
 connection default;
 
+
+--echo End of 4.1 tests
+
+
 #
 # Bug#14959: ALTER TABLE isn't able to rename a view
 #
@@ -85,4 +89,6 @@ rename table v2 to v1;
 rename table v2 to v1;
 drop view v1;
 drop table t1;
-# End of 4.1 tests
+
+
+--echo End of 5.0 tests