summaryrefslogtreecommitdiff
path: root/mysql-test/r/rename.result
diff options
context:
space:
mode:
authorunknown <kroki/tomash@moonlight.intranet>2006-11-03 12:25:34 +0300
committerunknown <kroki/tomash@moonlight.intranet>2006-11-03 12:25:34 +0300
commitab495e5013a8ac076e1572549c12090af2ce5c2a (patch)
treea01133ad38d2733b864913d38a67b839f75b70b2 /mysql-test/r/rename.result
parent413d2e28b69162d4918c1bd87017c95d07c399ec (diff)
parent0d92b17851f8a42f25bcb44695a5a653b85750a5 (diff)
downloadmariadb-git-ab495e5013a8ac076e1572549c12090af2ce5c2a.tar.gz
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.
Diffstat (limited to 'mysql-test/r/rename.result')
-rw-r--r--mysql-test/r/rename.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/rename.result b/mysql-test/r/rename.result
index 345270231ef..c93bf33a705 100644
--- a/mysql-test/r/rename.result
+++ b/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