diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-06-27 12:25:15 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-06-27 12:25:15 +0200 |
| commit | 74586e95fc3065e33162364886672ac49c5ea54e (patch) | |
| tree | 1c7d63a8de410d953596fc93dbf06db7157edb5b /mysql-test/r/client_xml.result | |
| parent | 7ce673073b86e1a7309cddb51c79bbdc3c1fa051 (diff) | |
| download | mariadb-git-74586e95fc3065e33162364886672ac49c5ea54e.tar.gz | |
Merge problem fixes
mysql-test/r/client_xml.result:
Update testresult
mysql-test/r/ndb_autodiscover.result:
Moving order opf test results to match test execution order
Diffstat (limited to 'mysql-test/r/client_xml.result')
| -rw-r--r-- | mysql-test/r/client_xml.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result index a4164148159..24c05c7f9d6 100644 --- a/mysql-test/r/client_xml.result +++ b/mysql-test/r/client_xml.result @@ -15,7 +15,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); </row> </resultset> <?xml version="1.0"?> -<mysqldump> +<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <database name="test"> <table_structure name="t1"> <field Field="a&b" Type="int(11)" Null="YES" Key="" Extra="" /> |