bk commit into 4.1 tree (msvensson:1.2292) BUG#9657

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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.2292 05/06/22 19:53:20 msvensson@neptunus.(none) +2 -0
  BUG#9657  mysqldump xml ( -x ) does not format NULL fields correctly
   

  mysql-test/r/mysqldump.result
    1.48 05/06/22 19:53:17 msvensson@neptunus.(none) +21 -21
    Update test result

  client/mysqldump.c
    1.191 05/06/22 19:53:17 msvensson@neptunus.(none) +6 -3
    Add reference xmlns in root element
    Use xsi:nil fro NULL elements.

# 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/bug9657

--- 1.190/client/mysqldump.c	2005-06-20 12:46:52 +02:00
+++ 1.191/client/mysqldump.c	2005-06-22 19:53:17 +02:00
@@ -470,7 +470,10 @@
   if (opt_xml)
   {
     fputs("<?xml version=\"1.0\"?>\n", sql_file);
-    fputs("<mysqldump>\n", sql_file);
+    fputs("<mysqldump ", sql_file);
+    fputs("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
+          sql_file);
+    fputs(">\n", sql_file);
     check_io(sql_file);
   }
   else if (!opt_compact)
@@ -1061,7 +1064,7 @@
 
   DESCRIPTION
     Print tag with one attribute to the xml_file. Format is:
-      <stag_atr="sval" nil="true"/>
+      <stag_atr="sval" xsi:nil="true"/>
   NOTE
     sval MUST be a NULL terminated string.
     sval string will be qouted before output.
@@ -1076,7 +1079,7 @@
   fputs(stag_atr, xml_file);
   fputs("\"", xml_file);
   print_quoted_xml(xml_file, sval, strlen(sval));
-  fputs("\" nil=\"true\" />", xml_file);
+  fputs("\" xsi:nil=\"true\" />", xml_file);
   fputs(send, xml_file);
   check_io(xml_file);
 }

--- 1.47/mysql-test/r/mysqldump.result	2005-06-20 12:46:52 +02:00
+++ 1.48/mysql-test/r/mysqldump.result	2005-06-22 19:53:17 +02:00
@@ -2,7 +2,7 @@
 CREATE TABLE t1(a int);
 INSERT INTO t1 VALUES (1), (2);
 <?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" Type="int(11)" Null="YES" Key="" Extra="" />
@@ -103,7 +103,7 @@
 CREATE TABLE t1(a int, b text, c varchar(3));
 INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
 <?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" Type="int(11)" Null="YES" Key="" Extra="" />
@@ -128,7 +128,7 @@
 CREATE TABLE t1 (`a"b"` char(2));
 INSERT INTO t1 VALUES ("1\""), ("\"2");
 <?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&quot;b&quot;" Type="char(2)" Null="YES" Key="" Extra=""
/>
@@ -1355,11 +1355,11 @@
 insert into t1 values (NULL), (10), (20);
 insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thirty");
 <?xml version="1.0"?>
-<mysqldump>
+<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <database name="test">
 	<table_data name="t1">
 	<row>
-		<field name="a" nil="true" />
+		<field name="a" xsi:nil="true" />
 	</row>
 	<row>
 		<field name="a">10</field>
@@ -1371,35 +1371,35 @@
 	<table_data name="t2">
 	<row>
 		<field name="pk">1</field>
-		<field name="a" nil="true" />
-		<field name="b" nil="true" />
-		<field name="c" nil="true" />
-		<field name="d" nil="true" />
-		<field name="e" nil="true" />
+		<field name="a" xsi:nil="true" />
+		<field name="b" xsi:nil="true" />
+		<field name="c" xsi:nil="true" />
+		<field name="d" xsi:nil="true" />
+		<field name="e" xsi:nil="true" />
 	</row>
 	<row>
 		<field name="pk">2</field>
 		<field name="a">10</field>
-		<field name="b" nil="true" />
-		<field name="c" nil="true" />
-		<field name="d" nil="true" />
-		<field name="e" nil="true" />
+		<field name="b" xsi:nil="true" />
+		<field name="c" xsi:nil="true" />
+		<field name="d" xsi:nil="true" />
+		<field name="e" xsi:nil="true" />
 	</row>
 	<row>
 		<field name="pk">3</field>
-		<field name="a" nil="true" />
+		<field name="a" xsi:nil="true" />
 		<field name="b">twenty</field>
-		<field name="c" nil="true" />
-		<field name="d" nil="true" />
-		<field name="e" nil="true" />
+		<field name="c" xsi:nil="true" />
+		<field name="d" xsi:nil="true" />
+		<field name="e" xsi:nil="true" />
 	</row>
 	<row>
 		<field name="pk">4</field>
 		<field name="a">30</field>
 		<field name="b">thirty</field>
-		<field name="c" nil="true" />
-		<field name="d" nil="true" />
-		<field name="e" nil="true" />
+		<field name="c" xsi:nil="true" />
+		<field name="d" xsi:nil="true" />
+		<field name="e" xsi:nil="true" />
 	</row>
 	</table_data>
 </database>