bk commit into 6.0 tree (msvensson:1.2627)

[msvensson]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-04-08 10:06:05+02:00, msvensson@stripped +2 -0
  Update paths
  Change "system rm" -> "remove_file"
  Write dump file to MYSQLTEST_VARDIR/tmp

  mysql-test/r/loadxml.result@stripped, 2008-04-08 10:06:02+02:00, msvensson@stripped +4
-4
    Update paths
    Change "system rm" -> "remove_file"
    Write dump file to MYSQLTEST_VARDIR/tmp

  mysql-test/t/loadxml.test@stripped, 2008-04-08 10:06:02+02:00, msvensson@stripped +6
-6
    Update paths
    Change "system rm" -> "remove_file"
    Write dump file to MYSQLTEST_VARDIR/tmp

diff -Nrup a/mysql-test/r/loadxml.result b/mysql-test/r/loadxml.result
--- a/mysql-test/r/loadxml.result	2007-07-19 12:27:47 +02:00
+++ b/mysql-test/r/loadxml.result	2008-04-08 10:06:02 +02:00
@@ -1,7 +1,7 @@
 drop table if exists t1;
 create table t1 (a int, b varchar(64));
 -- Load a static XML file
-load xml infile '../std_data_ln/loadxml.dat' into table t1
+load xml infile '../../std_data/loadxml.dat' into table t1
 rows identified by '<row>';
 select * from t1 order by a;
 a	b
@@ -18,7 +18,7 @@ a	b
 216	&bb b;
 delete from t1;
 -- Load a static XML file with 'IGNORE num ROWS'
-load xml infile '../std_data_ln/loadxml.dat' into table t1
+load xml infile '../../std_data/loadxml.dat' into table t1
 rows identified by '<row>' ignore 4 rows;
 select * from t1 order by a;
 a	b
@@ -31,7 +31,7 @@ a	b
 216	&bb b;
 -- Check 'mysqldump --xml' + 'LOAD XML' round trip
 delete from t1;
-load xml infile 'MYSQLTEST_VARDIR/loadxml-dump.xml' into table t1 rows identified by
'<row>';;
+load xml infile 'MYSQLTEST_VARDIR/tmp/loadxml-dump.xml' into table t1 rows identified by
'<row>';;
 select * from t1 order by a;
 a	b
 111	b111
@@ -43,7 +43,7 @@ a	b
 216	&bb b;
 --Check that default row tag is '<row>
 delete from t1;
-load xml infile 'MYSQLTEST_VARDIR/loadxml-dump.xml' into table t1;;
+load xml infile 'MYSQLTEST_VARDIR/tmp/loadxml-dump.xml' into table t1;;
 select * from t1 order by a;
 a	b
 111	b111
diff -Nrup a/mysql-test/t/loadxml.test b/mysql-test/t/loadxml.test
--- a/mysql-test/t/loadxml.test	2007-11-14 21:11:48 +01:00
+++ b/mysql-test/t/loadxml.test	2008-04-08 10:06:02 +02:00
@@ -13,29 +13,29 @@ create table t1 (a int, b varchar(64));
 
 
 --echo -- Load a static XML file
-load xml infile '../std_data_ln/loadxml.dat' into table t1
+load xml infile '../../std_data/loadxml.dat' into table t1
 rows identified by '<row>';
 select * from t1 order by a;
 delete from t1;
 
 
 --echo -- Load a static XML file with 'IGNORE num ROWS'
-load xml infile '../std_data_ln/loadxml.dat' into table t1
+load xml infile '../../std_data/loadxml.dat' into table t1
 rows identified by '<row>' ignore 4 rows;
 select * from t1 order by a;
 
 
 --echo -- Check 'mysqldump --xml' + 'LOAD XML' round trip
---exec $MYSQL_DUMP --xml test t1 > "$MYSQLTEST_VARDIR/loadxml-dump.xml" 2>&1
+--exec $MYSQL_DUMP --xml test t1 > "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml"
2>&1
 delete from t1;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---eval load xml infile '$MYSQLTEST_VARDIR/loadxml-dump.xml' into table t1 rows identified
by '<row>';
+--eval load xml infile '$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml' into table t1 rows
identified by '<row>';
 select * from t1 order by a;
 
 --echo --Check that default row tag is '<row>
 delete from t1;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---eval load xml infile '$MYSQLTEST_VARDIR/loadxml-dump.xml' into table t1;
+--eval load xml infile '$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml' into table t1;
 select * from t1 order by a;
 
 --echo -- Check that 'xml' is not a keyword
@@ -45,6 +45,6 @@ select 1 as xml;
 #
 # Clean up
 #
---system rm $MYSQLTEST_VARDIR/loadxml-dump.xml
+remove_file $MYSQLTEST_VARDIR/tmp/loadxml-dump.xml;
 drop table t1;