bk commit into 5.0 tree (msvensson:1.1998)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1998 05/06/22 20:49:58 msvensson@neptunus.(none) +2 -0
  Merge fixes

  mysql-test/t/mysqldump.test
    1.48 05/06/22 20:49:52 msvensson@neptunus.(none) +1 -1
    Add "use test" removed by the cset -x

  mysql-test/r/mysqldump.result
    1.53 05/06/22 20:49:52 msvensson@neptunus.(none) +2 -2
    Update test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.52/mysql-test/r/mysqldump.result	2005-06-22 20:37:49 +02:00
+++ 1.53/mysql-test/r/mysqldump.result	2005-06-22 20:49:52 +02:00
@@ -1530,7 +1530,7 @@
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 <?xml version="1.0"?>
-<mysqldump>
+<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <database name="mysqldump_test_db">
 	<table_structure name="t1">
 		<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
@@ -1541,7 +1541,7 @@
 </database>
 </mysqldump>
 <?xml version="1.0"?>
-<mysqldump>
+<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <database name="mysqldump_test_db">
 	<table_structure name="t1">
 		<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />

--- 1.47/mysql-test/t/mysqldump.test	2005-06-22 20:45:19 +02:00
+++ 1.48/mysql-test/t/mysqldump.test	2005-06-22 20:49:52 +02:00
@@ -665,7 +665,7 @@
 
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
-
+use test;
 
 #
 # Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly