summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-11-11 05:42:02 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2009-11-11 05:42:02 +0400
commit134d2fb675a5b7b1f98c4b8d4a0d07a9095332b7 (patch)
tree5d0eba993fbeaa515df9814725f4ad19c1f2b6a0 /mysql-test
parentc868e89f82ffbaa2ec624e39294a48867da392c8 (diff)
downloadmariadb-git-134d2fb675a5b7b1f98c4b8d4a0d07a9095332b7.tar.gz
loadxml test update.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/loadxml.result2
-rw-r--r--mysql-test/t/loadxml.test1
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/loadxml.result b/mysql-test/r/loadxml.result
index 25bc82a0a2e..e7a32aa368a 100644
--- a/mysql-test/r/loadxml.result
+++ b/mysql-test/r/loadxml.result
@@ -62,7 +62,7 @@ LOAD XML LOCAL INFILE "MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROW
show processlist;
Id User Host db Command Time State Info
# root localhost test Query # NULL show processlist
-# root localhost test Query # Reading from net LOAD XML LOCAL INFILE "/home/hf/work/mysql_common/51alik/mysql-test/var/tmp/loadxml-dump.xml" INTO
+# root localhost test Query # Reading from net LOAD XML LOCAL INFILE "MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO
drop table t1;
drop table t2;
create table t1 (
diff --git a/mysql-test/t/loadxml.test b/mysql-test/t/loadxml.test
index e3e4bbbee19..396fba6a6f2 100644
--- a/mysql-test/t/loadxml.test
+++ b/mysql-test/t/loadxml.test
@@ -79,6 +79,7 @@ sleep 3;
connection default;
sleep 1;
--replace_column 1 # 3 localhost 6 #
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
show processlist;
--disable_query_log