bk commit into 5.0 tree (bar:1.2477) BUG#25946

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.2477 07/03/27 13:30:43 bar@stripped +2 -0
  Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values
  Fix: adding namespace reference into "mysql --xml" output,
  to make it work similary to "mysqldump --xml".

  mysql-test/r/client_xml.result
    1.5 07/03/27 13:30:41 bar@stripped +6 -6
    Fixing test results

  client/mysql.cc
    1.235 07/03/27 13:30:40 bar@stripped +2 -1
    Adding namespace reference.

# 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:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.0.b25946

--- 1.234/client/mysql.cc	2007-03-03 15:14:34 +04:00
+++ 1.235/client/mysql.cc	2007-03-27 13:30:40 +05:00
@@ -2529,7 +2529,8 @@
 
   tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);
   xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr()));
-  tee_fputs("\">", PAGER);
+  tee_fputs("\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">",
+            PAGER);
 
   fields = mysql_fetch_fields(result);
   while ((cur = mysql_fetch_row(result)))

--- 1.4/mysql-test/r/client_xml.result	2006-09-29 16:29:34 +05:00
+++ 1.5/mysql-test/r/client_xml.result	2007-03-27 13:30:41 +05:00
@@ -7,7 +7,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select * from t1
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="a&amp;b">1</field>
 	<field name="a&lt;b">2</field>
@@ -34,7 +34,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select count(*) from t1
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="count(*)">1</field>
   </row>
@@ -42,7 +42,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select 1 &lt; 2 from dual
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="1 &lt; 2">1</field>
   </row>
@@ -50,7 +50,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select 1 &gt; 2 from dual
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="1 &gt; 2">0</field>
   </row>
@@ -58,7 +58,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select 1 &amp; 3 from dual
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="1 &amp; 3">1</field>
   </row>
@@ -66,7 +66,7 @@
 <?xml version="1.0"?>
 
 <resultset statement="select null from dual
-">
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <row>
 	<field name="NULL" xsi:nil="true" />
   </row>