From 6d9aa9ea29500db806fdbb55895797a57fa0895b Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@mysql.com>
Date: Wed, 11 Nov 2009 00:55:05 +0400
Subject: [PATCH] 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.
---
 client/mysqltest.cc         | 6 ++++--
 mysql-test/r/loadxml.result | 4 ++--
 mysql-test/t/loadxml.test   | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index a20e078230b..4f42077a2f9 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -281,7 +281,7 @@ enum enum_commands {
   Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR,
   Q_LIST_FILES, Q_LIST_FILES_WRITE_FILE, Q_LIST_FILES_APPEND_FILE,
   Q_SEND_SHUTDOWN, Q_SHUTDOWN_SERVER,
-  Q_MOVE_FILE,
+  Q_MOVE_FILE, Q_SEND_EVAL,
 
   Q_UNKNOWN,			       /* Unknown command.   */
   Q_COMMENT,			       /* Comments, ignored. */
@@ -376,6 +376,7 @@ const char *command_names[]=
   "send_shutdown",
   "shutdown_server",
   "move_file",
+  "send_eval",
 
   0
 };
@@ -7006,7 +7007,7 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
   /*
     Evaluate query if this is an eval command
   */
-  if (command->type == Q_EVAL)
+  if (command->type == Q_EVAL || command->type == Q_SEND_EVAL)
   {
     init_dynamic_string(&eval_query, "", command->query_len+256, 1024);
     do_eval(&eval_query, command->query, command->end, FALSE);
@@ -7825,6 +7826,7 @@ int main(int argc, char **argv)
 	break;
       }
       case Q_SEND:
+      case Q_SEND_EVAL:
         if (!*command->first_argument)
         {
           /*
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 (
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;