diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-11 00:55:05 +0400 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-11 00:55:05 +0400 |
commit | 6d9aa9ea29500db806fdbb55895797a57fa0895b (patch) | |
tree | 531a275f30bff91b601f33b8605494165e470847 /mysql-test/t/loadxml.test | |
parent | 52beed00e238b6770cd3f9138d962a32d714137e (diff) | |
download | mariadb-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/t/loadxml.test')
-rw-r--r-- | mysql-test/t/loadxml.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/loadxml.test b/mysql-test/t/loadxml.test index accd08c8bfe..e3e4bbbee19 100644 --- a/mysql-test/t/loadxml.test +++ b/mysql-test/t/loadxml.test @@ -70,17 +70,20 @@ connection addconroot; create table t2(fl text); --let $PSEUDO_THREAD_ID=`select @@pseudo_thread_id ` ---send LOAD XML LOCAL INFILE "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROWS IDENTIFIED BY '<person>'; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--send_eval LOAD XML LOCAL INFILE "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml" INTO TABLE t2 ROWS IDENTIFIED BY '<person>'; sleep 3; connection default; +sleep 1; --replace_column 1 # 3 localhost 6 # show processlist; --disable_query_log --eval kill $PSEUDO_THREAD_ID +sleep 2; --enable_query_log disconnect addconroot; |