summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-05-08 19:23:39 +0200
committerSergei Golubchik <serg@mariadb.org>2017-05-09 00:28:43 +0200
commitfbdf18f86e3a631034800eb534f29f615ff7a1a4 (patch)
tree9bf3245f5b2c6b283453a7fd844580127f3afc9d /mysql-test/std_data
parentd738722eeee34df67081f8afe5ccd5d28c1e275f (diff)
downloadmariadb-git-fbdf18f86e3a631034800eb534f29f615ff7a1a4.tar.gz
MDEV-12696 Crash with LOAD XML and non-updatable VIEW column
extend the fix from 5.5 (in read_sep_field()) to apply to read_xml_field()
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r--mysql-test/std_data/loaddata/mdev12696.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/std_data/loaddata/mdev12696.xml b/mysql-test/std_data/loaddata/mdev12696.xml
new file mode 100644
index 00000000000..a2789acbde5
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev12696.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<resultset statement="SELECT 'test' AS c1, NULL AS c2
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <row>
+ <field name="c1">test</field>
+ <field name="c2" xsi:nil="true" />
+ </row>
+</resultset>