diff options
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | mysql-test/r/client_xml.result | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 2faa2f31a50..510420fdf3d 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2529,7 +2529,8 @@ print_table_data_xml(MYSQL_RES *result) tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER); xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr())); - tee_fputs("\">", PAGER); + tee_fputs("\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">", + PAGER); fields = mysql_fetch_fields(result); while ((cur = mysql_fetch_row(result))) diff --git a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result index 7395b2433e8..6a148954fcd 100644 --- a/mysql-test/r/client_xml.result +++ b/mysql-test/r/client_xml.result @@ -7,7 +7,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select * from t1 -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="a&b">1</field> <field name="a<b">2</field> @@ -34,7 +34,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select count(*) from t1 -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="count(*)">1</field> </row> @@ -42,7 +42,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select 1 < 2 from dual -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="1 < 2">1</field> </row> @@ -50,7 +50,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select 1 > 2 from dual -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="1 > 2">0</field> </row> @@ -58,7 +58,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select 1 & 3 from dual -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="1 & 3">1</field> </row> @@ -66,7 +66,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); <?xml version="1.0"?> <resultset statement="select null from dual -"> +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <row> <field name="NULL" xsi:nil="true" /> </row> |