bk commit into 5.1 tree (msvensson:1.2543)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-12-05 12:17:30+01:00, msvensson@stripped +1 -0
  Rename master-data to mysqld.1/data

  mysql-test/t/upgrade.test@stripped, 2007-12-05 12:17:24+01:00, msvensson@stripped +6 -6
    Rename master-data to mysqld.1/data

diff -Nrup a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
--- a/mysql-test/t/upgrade.test	2007-10-08 20:37:55 +02:00
+++ b/mysql-test/t/upgrade.test	2007-12-05 12:17:24 +01:00
@@ -57,7 +57,7 @@ drop table `txu#p#p1`;
 # Check if old tables work
 #
 
-system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm;
+system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm;
 truncate t1;
 drop table t1;
 
@@ -75,11 +75,11 @@ create table tabc.t1 (a int);
 FLUSH TABLES;
 
 # Manually make a 5.0 database from the template
---exec mkdir $MYSQLTEST_VARDIR/master-data/a-b-c
---copy_file $MYSQLTEST_VARDIR/master-data/tabc/db.opt $MYSQLTEST_VARDIR/master-data/a-b-c/db.opt
---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.frm $MYSQLTEST_VARDIR/master-data/a-b-c/t1.frm
---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYD $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYD
---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYI $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYI
+--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/a-b-c
+--copy_file $MYSQLTEST_VARDIR/mysqld.1/data/tabc/db.opt $MYSQLTEST_VARDIR/mysqld.1/data/a-b-c/db.opt
+--copy_file $MYSQLTEST_VARDIR/mysqld.1/data/tabc/t1.frm $MYSQLTEST_VARDIR/mysqld.1/data/a-b-c/t1.frm
+--copy_file $MYSQLTEST_VARDIR/mysqld.1/data/tabc/t1.MYD $MYSQLTEST_VARDIR/mysqld.1/data/a-b-c/t1.MYD
+--copy_file $MYSQLTEST_VARDIR/mysqld.1/data/tabc/t1.MYI $MYSQLTEST_VARDIR/mysqld.1/data/a-b-c/t1.MYI
 
 show databases like '%a-b-c%';
 ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;