bk commit into 5.1 tree (mattiasj:1.2606) BUG#32091

[mattiasj]

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj. When mattiasj 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, 2007-11-10 14:56:21+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  small fix of test case (when running make test after
  merge, it did not substitute MYSQLTEST_VARDIR in
  the error)

  mysql-test/r/partition_mgm.result@stripped, 2007-11-10 14:56:19+01:00,
mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test result

  mysql-test/t/partition_mgm.test@stripped, 2007-11-10 14:56:19+01:00,
mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test case

diff -Nrup a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result
--- a/mysql-test/r/partition_mgm.result	2007-11-09 23:21:58 +01:00
+++ b/mysql-test/r/partition_mgm.result	2007-11-10 14:56:19 +01:00
@@ -65,7 +65,7 @@ PARTITION p1 VALUES IN (1)
 DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/test'
      INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/test'
    );
-ERROR HY000: Can't create/write to file
'MYSQLTEST_VARDIR/master-data/mysqltest2/t1#P#p0.MYI' (Errcode: 17)
+Got one of the listed errors
 CREATE TABLE t1 (a INT)
 PARTITION BY LIST (a) (
 PARTITION p0 VALUES IN (0)
@@ -75,7 +75,7 @@ PARTITION p1 VALUES IN (1)
 DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2'
      INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2'
   );
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI'
(Errcode: 17)
+Got one of the listed errors
 # user root (cleanup):
 DROP DATABASE mysqltest2;
 USE test;
diff -Nrup a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test
--- a/mysql-test/t/partition_mgm.test	2007-11-09 23:21:58 +01:00
+++ b/mysql-test/t/partition_mgm.test	2007-11-10 14:56:19 +01:00
@@ -84,7 +84,7 @@ connection con1;
 -- echo # user mysqltest_1:
   USE test;
   -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-  -- error 1
+  -- error 1,1
   eval CREATE TABLE t1 (a INT)
    PARTITION BY LIST (a) (
     PARTITION p0 VALUES IN (0)
@@ -95,7 +95,7 @@ connection con1;
      INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test'
    );
   -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-  -- error 1
+  -- error 1,1
   eval CREATE TABLE t1 (a INT)
    PARTITION BY LIST (a) (
     PARTITION p0 VALUES IN (0)