From: Date: August 26 2008 4:31pm
Subject: bzr commit into mysql-5.1 branch (mattiasj:2725) Bug#32167
List-Archive: http://lists.mysql.com/commits/52569
X-Bug: 32167
Message-Id: <20080826143148.7FDB1FC57EC@witty.localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/mattiasj/clones/bzrroot/topush4-51-bugteam/

 2725 Mattias Jonsson	2008-08-26
      Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY
      
      post push fix
      
      Updated partition_symlink since different error behavior
      if embedded (or not partitioned)
modified:
  mysql-test/r/partition_symlink.result
  mysql-test/t/partition_symlink.test

per-file messages:
  mysql-test/r/partition_symlink.result
    Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY
    
    updated result file
  mysql-test/t/partition_symlink.test
    Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY
    
    Fix for embedded
=== modified file 'mysql-test/r/partition_symlink.result'
--- a/mysql-test/r/partition_symlink.result	2008-08-23 02:47:43 +0000
+++ b/mysql-test/r/partition_symlink.result	2008-08-26 14:31:30 +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-23 02:47:43 +0000
+++ b/mysql-test/t/partition_symlink.test	2008-08-26 14:31:30 +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,