1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
unknown
2005-06-27 12:25:15 +02:00
parent 7ce673073b
commit 74586e95fc
2 changed files with 11 additions and 11 deletions

View File

@ -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&amp;b" Type="int(11)" Null="YES" Key="" Extra="" />