bk commit into 5.0 tree (kroki:1.2284)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash 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, 2006-11-03 12:22:39+03:00, kroki@stripped +2 -0
  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@stripped, 2006-11-03 12:22:37+03:00, kroki@stripped +1 -0
    Manual merge.
    MERGE: 1.7.1.3

  mysql-test/t/rename.test@stripped, 2006-11-03 12:22:37+03:00, kroki@stripped +6 -7
    Manual merge.
    MERGE: 1.11.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-cleanup/RESYNC

--- 1.13/mysql-test/r/rename.result	2006-11-03 12:22:46 +03:00
+++ 1.14/mysql-test/r/rename.result	2006-11-03 12:22:46 +03:00
@@ -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

--- 1.13/mysql-test/t/rename.test	2006-11-03 12:22:46 +03:00
+++ 1.14/mysql-test/t/rename.test	2006-11-03 12:22:46 +03:00
@@ -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