Merge problem fixes

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

mysql-test/r/ndb_autodiscover.result

@@ -373,6 +373,16 @@ use test2;
 drop table t2;
 drop database test2;
 use test;
+drop database if exists test_only_ndb_tables;
+create database test_only_ndb_tables;
+use test_only_ndb_tables;
+create table t1 (a int primary key) engine=ndb;
+select * from t1;
+a
+select * from t1;
+ERROR HY000: Can't lock file (errno: 4009)
+use test;
+drop database test_only_ndb_tables;
 CREATE TABLE sys.SYSTAB_0 (a int);
 ERROR 42S01: Table 'SYSTAB_0' already exists
 select * from sys.SYSTAB_0;
@@ -387,16 +397,6 @@ ERROR 42S02: Unknown table 'SYSTAB_0'
 drop table IF EXISTS sys.SYSTAB_0;
 Warnings:
 Note	1051	Unknown table 'SYSTAB_0'
-drop database if exists test_only_ndb_tables;
-create database test_only_ndb_tables;
-use test_only_ndb_tables;
-create table t1 (a int primary key) engine=ndb;
-select * from t1;
-a
-select * from t1;
-ERROR HY000: Can't lock file (errno: 4009)
-use test;
-drop database test_only_ndb_tables;
 CREATE TABLE t9 (
 a int NOT NULL PRIMARY KEY,
 b int