Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f418475e
Commit
f418475e
authored
Mar 28, 2007
by
bar@bar.myoffice.izhnet.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/bar/mysql-5.0.b25946
into mysql.com:/home/bar/mysql-5.1.b25946
parents
7054aaaa
5e52cd36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
client/mysql.cc
client/mysql.cc
+2
-1
mysql-test/r/client_xml.result
mysql-test/r/client_xml.result
+6
-6
No files found.
client/mysql.cc
View file @
f418475e
...
@@ -2517,7 +2517,8 @@ print_table_data_xml(MYSQL_RES *result)
...
@@ -2517,7 +2517,8 @@ print_table_data_xml(MYSQL_RES *result)
tee_fputs
(
"<?xml version=
\"
1.0
\"
?>
\n\n
<resultset statement=
\"
"
,
PAGER
);
tee_fputs
(
"<?xml version=
\"
1.0
\"
?>
\n\n
<resultset statement=
\"
"
,
PAGER
);
xmlencode_print
(
glob_buffer
.
ptr
(),
(
int
)
strlen
(
glob_buffer
.
ptr
()));
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
);
fields
=
mysql_fetch_fields
(
result
);
while
((
cur
=
mysql_fetch_row
(
result
)))
while
((
cur
=
mysql_fetch_row
(
result
)))
...
...
mysql-test/r/client_xml.result
View file @
f418475e
...
@@ -7,7 +7,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -7,7 +7,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select * from t1
<resultset statement="select * from t1
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="a&b">1</field>
<field name="a&b">1</field>
<field name="a<b">2</field>
<field name="a<b">2</field>
...
@@ -34,7 +34,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -34,7 +34,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select count(*) from t1
<resultset statement="select count(*) from t1
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="count(*)">1</field>
<field name="count(*)">1</field>
</row>
</row>
...
@@ -42,7 +42,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -42,7 +42,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select 1 < 2 from dual
<resultset statement="select 1 < 2 from dual
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="1 < 2">1</field>
<field name="1 < 2">1</field>
</row>
</row>
...
@@ -50,7 +50,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -50,7 +50,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select 1 > 2 from dual
<resultset statement="select 1 > 2 from dual
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="1 > 2">0</field>
<field name="1 > 2">0</field>
</row>
</row>
...
@@ -58,7 +58,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -58,7 +58,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select 1 & 3 from dual
<resultset statement="select 1 & 3 from dual
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="1 & 3">1</field>
<field name="1 & 3">1</field>
</row>
</row>
...
@@ -66,7 +66,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
...
@@ -66,7 +66,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<?xml version="1.0"?>
<?xml version="1.0"?>
<resultset statement="select null from dual
<resultset statement="select null from dual
">
"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<row>
<row>
<field name="NULL" xsi:nil="true" />
<field name="NULL" xsi:nil="true" />
</row>
</row>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment