From 4def52165d3724080793a752f244e56aea3aecc0 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mysql.com>
Date: Wed, 14 Oct 2009 17:10:22 +0500
Subject: A postfix for backporting WL#1397 convert XML -> SQL

mysql-test/r/loadxml.result
mysql-test/t/loadxml.test
  Fixing non-deterministic test results

sql/sql_yacc.yy
  Initializing fname_first using get_tok_end() instead of get_ptr().
  The latter is grammar-dependant. The former is not.
---
 mysql-test/r/loadxml.result | 4 ++--
 mysql-test/t/loadxml.test   | 1 +
 sql/sql_yacc.yy             | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/loadxml.result b/mysql-test/r/loadxml.result
index dc2392e5593..d7967a105f8 100644
--- a/mysql-test/r/loadxml.result
+++ b/mysql-test/r/loadxml.result
@@ -61,8 +61,8 @@ create table t2(fl text);
 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
-2	root	localhost	test	Query	0	NULL	show processlist
-5	root	localhost	test	Query	3	Reading from net	LOAD XML LOCAL INFILE "$MYSQLTEST_VARDIR/tmp/loadxml-dump.xml"  INTO TABLE t2 ROWS IDENTIFIED BY '<p
+#	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
 drop table t1;
 drop table t2;
 create table t1 (
diff --git a/mysql-test/t/loadxml.test b/mysql-test/t/loadxml.test
index bb088559ae2..accd08c8bfe 100644
--- a/mysql-test/t/loadxml.test
+++ b/mysql-test/t/loadxml.test
@@ -76,6 +76,7 @@ sleep 3;
 
 
 connection default;
+--replace_column 1 # 3 localhost 6 #
 show processlist;
 
 --disable_query_log
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3b828b69b0c..f8650d83bc6 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -10678,7 +10678,7 @@ load:
                        $2 == FILETYPE_CSV ? "LOAD DATA" : "LOAD XML");
               MYSQL_YYABORT;
             }
-            lex->fname_start= lip->get_ptr();
+            lex->fname_start= lip->get_tok_end();
           }
           load_data_lock opt_local INFILE TEXT_STRING_filesystem
           {
@@ -10729,14 +10729,12 @@ load:
           {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
-            Lex_input_stream *lip= YYLIP;
 
             if (lex->sphead)
             {
               my_error(ER_SP_BADSTATEMENT, MYF(0), "LOAD DATA");
               MYSQL_YYABORT;
             }
-            lex->fname_start= lip->get_ptr();
             Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
             WARN_DEPRECATED(yythd, "6.0", "LOAD DATA FROM MASTER",
                             "mysqldump or future "
-- 
cgit v1.2.1