bzr push into mysql-6.0 branch (mattiasj:2802)

[Mattias Jonsson]

 2802 Mattias Jonsson	2008-08-26 [merge]
      merge (from mysql-5.1-bugteam -> mysql-6.0-bugteam
added:
  mysql-test/r/backup_view_on_view.result
  mysql-test/t/backup_view_on_view.test

=== modified file 'mysql-test/r/partition_symlink.result'
--- a/mysql-test/r/partition_symlink.result	2008-08-24 16:12:12 +0000
+++ b/mysql-test/r/partition_symlink.result	2008-08-26 14:38:36 +0000
@@ -113,9 +113,9 @@ set @@sql_mode=@org_mode;
 create table t1 (a int)
 partition by key (a)
 (partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
-ERROR HY000: Incorrect arguments to DATA DIRECTORY
+Got one of the listed errors
 create table t1 (a int)
 partition by key (a)
 (partition p0,
 partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
-ERROR HY000: Incorrect arguments to DATA DIRECTORY
+Got one of the listed errors

=== modified file 'mysql-test/t/partition_symlink.test'
--- a/mysql-test/t/partition_symlink.test	2008-08-24 16:12:12 +0000
+++ b/mysql-test/t/partition_symlink.test	2008-08-26 14:38:36 +0000
@@ -154,7 +154,8 @@ set @@sql_mode=@org_mode;
 #
 # Bug 21350: Data Directory problems
 #
--- error ER_WRONG_ARGUMENTS
+# Added ER_WRONG_TABLE_NAME and reported bug#39045
+-- error ER_WRONG_ARGUMENTS, ER_WRONG_TABLE_NAME
 create table t1 (a int)
 partition by key (a)
 (partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
@@ -163,7 +164,8 @@ partition by key (a)
 # Insert a test that manages to create the first partition and fails with
 # the second, ensure that we clean up afterwards in a proper manner.
 #
---error ER_WRONG_ARGUMENTS
+# Added ER_WRONG_TABLE_NAME and reported bug#39045
+--error ER_WRONG_ARGUMENTS, ER_WRONG_TABLE_NAME
 create table t1 (a int)
 partition by key (a)
 (partition p0,