bk commit into 5.1 tree (msvensson:1.2536)

[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 11:06:23+01:00, msvensson@stripped +2 -0
  Rename std_data_ln -> std_data
  Rename master-data -> mysqld.1/data

  mysql-test/r/loaddata.result@stripped, 2007-12-05 11:06:21+01:00, msvensson@stripped +1 -1
    Rename std_data_ln -> std_data

  mysql-test/t/loaddata.test@stripped, 2007-12-05 11:06:22+01:00, msvensson@stripped +2 -2
    Rename std_data_ln -> std_data
    Rename master-data -> mysqld.1/data

diff -Nrup a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
--- a/mysql-test/r/loaddata.result	2007-12-04 13:01:43 +01:00
+++ b/mysql-test/r/loaddata.result	2007-12-05 11:06:21 +01:00
@@ -170,7 +170,7 @@ select @a, @b;
 @a	@b
 NULL	15
 truncate table t1;
-load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 set c=b;
+load data infile '../../std_data/rpl_loaddata.dat' into table t1 set c=b;
 Warnings:
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 2 doesn't contain data for all columns
diff -Nrup a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
--- a/mysql-test/t/loaddata.test	2007-12-04 12:39:37 +01:00
+++ b/mysql-test/t/loaddata.test	2007-12-05 11:06:22 +01:00
@@ -127,7 +127,7 @@ select * from t1;
 select @a, @b;
 truncate table t1;
 # Reading of all columns with set
-load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 set c=b;
+load data infile '../../std_data/rpl_loaddata.dat' into table t1 set c=b;
 select * from t1;
 truncate table t1;
 # now going to test fixed field-row file format
@@ -262,6 +262,6 @@ select @@character_set_filesystem;
 LOAD DATA INFILE 't@002d1' INTO TABLE t1;
 SELECT * FROM t1;
 DROP TABLE t1;
-remove_file $MYSQLTEST_VARDIR/master-data/test/t@002d1;
+remove_file $MYSQLTEST_VARDIR/mysqld.1/data/test/t@002d1;
 SET character_set_filesystem=default;
 select @@character_set_filesystem;