diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-14 17:10:22 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-14 17:10:22 +0500 |
| commit | 583b8530922c7812da9f684fe6b69579aeee4a1f (patch) | |
| tree | f53ec25db050ef6cc51cc723cdcf01685b276759 /mysql-test/r/loadxml.result | |
| parent | 741a1df4cc2c4ac44bbb07155ec21d6f0e8f75b7 (diff) | |
| download | mariadb-git-583b8530922c7812da9f684fe6b69579aeee4a1f.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r/loadxml.result')
| -rw-r--r-- | mysql-test/r/loadxml.result | 4 |
1 files changed, 2 insertions, 2 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 ( |