summaryrefslogtreecommitdiff
path: root/mysql-test/r/loadxml.result
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-11-11 00:55:05 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2009-11-11 00:55:05 +0400
commit6d9aa9ea29500db806fdbb55895797a57fa0895b (patch)
tree531a275f30bff91b601f33b8605494165e470847 /mysql-test/r/loadxml.result
parent52beed00e238b6770cd3f9138d962a32d714137e (diff)
downloadmariadb-git-6d9aa9ea29500db806fdbb55895797a57fa0895b.tar.gz
Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
The additional patch. That 'loadxml.test' failure was actually about our testing system, not the code. Firstly we need a new mysqltest command, wich i called 'send_eval'. So the expression can be evaluated, then started in a parallel thread. We only have separane 'send' and 'eval' commands at the moment. Then we need to add the waiting code after the 'KILL' to our test, so the thread will be killed before the test goes further. The present 'reap' command doesn't handle the killed threads well. per-file comments: client/mysqltest.cc Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 The 'send_eval' command implemented. mysql-test/r/loadxml.result Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 test result updated. mysql-test/t/loadxml.test Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 test case added.
Diffstat (limited to 'mysql-test/r/loadxml.result')
-rw-r--r--mysql-test/r/loadxml.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/loadxml.result b/mysql-test/r/loadxml.result
index d7967a105f8..25bc82a0a2e 100644
--- a/mysql-test/r/loadxml.result
+++ b/mysql-test/r/loadxml.result
@@ -58,11 +58,11 @@ select 1 as xml;
xml
1
create table t2(fl text);
-LOAD XML LOCAL INFILE "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROWS IDENTIFIED BY '<person>';;
+LOAD XML LOCAL INFILE "MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROWS IDENTIFIED BY '<person>';;
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 "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROWS IDENTIFIED BY '<p
+# 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
drop table t1;
drop table t2;
create table t1 (