1 files changed, 19 insertions, 19 deletions
diff --git a/storage/connect/mysql-test/connect/r/xml2.result b/storage/connect/mysql-test/connect/r/xml2.result
index f7bbc17c8a0..891c6e6f8dd 100644
--- a/storage/connect/mysql-test/connect/r/xml2.result
+++ b/storage/connect/mysql-test/connect/r/xml2.result
@@ -87,9 +87,9 @@ DROP TABLE t1;
 # Testing mixed tag and attribute values
 #
 CREATE TABLE t1 (
-ISBN CHAR(15) FIELD_FORMAT='@',
-LANG CHAR(2)  FIELD_FORMAT='@',
-SUBJECT CHAR(32) FIELD_FORMAT='@',
+ISBN CHAR(15) XPATH='@',
+LANG CHAR(2)  XPATH='@',
+SUBJECT CHAR(32) XPATH='@',
 AUTHOR CHAR(50),
 TITLE CHAR(32),
 TRANSLATOR CHAR(40),
@@ -120,9 +120,9 @@ DROP TABLE t1;
 # Testing INSERT on mixed tag and attribute values
 #
 CREATE TABLE t1 (
-ISBN CHAR(15) FIELD_FORMAT='@',
-LANG CHAR(2)  FIELD_FORMAT='@',
-SUBJECT CHAR(32) FIELD_FORMAT='@',
+ISBN CHAR(15) XPATH='@',
+LANG CHAR(2)  XPATH='@',
+SUBJECT CHAR(32) XPATH='@',
 AUTHOR CHAR(50),
 TITLE CHAR(32),
 TRANSLATOR CHAR(40),
@@ -207,18 +207,18 @@ DROP TABLE t1;
 # Testing XPath
 #
 CREATE TABLE t1 (
-isbn       CHAR(15) FIELD_FORMAT='@ISBN',
-language   CHAR(2)  FIELD_FORMAT='@LANG',
-subject    CHAR(32) FIELD_FORMAT='@SUBJECT',
-authorfn   CHAR(20) FIELD_FORMAT='AUTHOR/FIRSTNAME',
-authorln   CHAR(20) FIELD_FORMAT='AUTHOR/LASTNAME',
-title      CHAR(32) FIELD_FORMAT='TITLE',
-translated CHAR(32) FIELD_FORMAT='TRANSLATOR/@PREFIX',
-tranfn     CHAR(20) FIELD_FORMAT='TRANSLATOR/FIRSTNAME',
-tranln     CHAR(20) FIELD_FORMAT='TRANSLATOR/LASTNAME',
-publisher  CHAR(20) FIELD_FORMAT='PUBLISHER/NAME',
-location   CHAR(20) FIELD_FORMAT='PUBLISHER/PLACE',
-year       INT(4)   FIELD_FORMAT='DATEPUB'
+isbn       CHAR(15) XPATH='@ISBN',
+language   CHAR(2)  XPATH='@LANG',
+subject    CHAR(32) XPATH='@SUBJECT',
+authorfn   CHAR(20) XPATH='AUTHOR/FIRSTNAME',
+authorln   CHAR(20) XPATH='AUTHOR/LASTNAME',
+title      CHAR(32) XPATH='TITLE',
+translated CHAR(32) XPATH='TRANSLATOR/@PREFIX',
+tranfn     CHAR(20) XPATH='TRANSLATOR/FIRSTNAME',
+tranln     CHAR(20) XPATH='TRANSLATOR/LASTNAME',
+publisher  CHAR(20) XPATH='PUBLISHER/NAME',
+location   CHAR(20) XPATH='PUBLISHER/PLACE',
+year       INT(4)   XPATH='DATEPUB'
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample.xml'
   TABNAME='BIBLIO' OPTION_LIST='rownode=BOOK,skipnull=1,xmlsup=libxml2';
 SELECT * FROM t1;
@@ -260,7 +260,7 @@ DROP TABLE t1;
 #
 CREATE TABLE t1
 (
-isbn       CHAR(15) FIELD_FORMAT='@isbn'
+isbn       CHAR(15) XPATH='@isbn'
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample.xml'
   TABNAME='BIBLIO' OPTION_LIST='rownode=BOOK,skipnull=1,xmlsup=libxml2';
 SELECT * FROM t1;