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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6ef92d62
Commit
6ef92d62
authored
Mar 03, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
parents
d9773c13
73e4c474
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
1 deletion
+26
-1
mysql-test/r/xml.result
mysql-test/r/xml.result
+12
-0
mysql-test/t/xml.test
mysql-test/t/xml.test
+8
-0
sql/item_xmlfunc.cc
sql/item_xmlfunc.cc
+6
-1
No files found.
mysql-test/r/xml.result
View file @
6ef92d62
...
@@ -561,3 +561,15 @@ A B C
...
@@ -561,3 +561,15 @@ A B C
select extractvalue('<A_B>A</A_B>','/A_B');
select extractvalue('<A_B>A</A_B>','/A_B');
extractvalue('<A_B>A</A_B>','/A_B')
extractvalue('<A_B>A</A_B>','/A_B')
A
A
select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');
extractvalue('<a>Jack</a>','/a[contains(../a,"J")]')
Jack
select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');
extractvalue('<a>Jack</a>','/a[contains(../a,"j")]')
Jack
select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);
extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin)
select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');
extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]')
mysql-test/t/xml.test
View file @
6ef92d62
...
@@ -254,3 +254,11 @@ select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');
...
@@ -254,3 +254,11 @@ select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');
# Bug #16320 XML: extractvalue() won't accept names containing underscores
# Bug #16320 XML: extractvalue() won't accept names containing underscores
#
#
select
extractvalue
(
'<A_B>A</A_B>'
,
'/A_B'
);
select
extractvalue
(
'<A_B>A</A_B>'
,
'/A_B'
);
#
# Bug#16316: XML: extractvalue() is case-sensitive with contains()
#
select
extractvalue
(
'<a>Jack</a>'
,
'/a[contains(../a,"J")]'
);
select
extractvalue
(
'<a>Jack</a>'
,
'/a[contains(../a,"j")]'
);
select
extractvalue
(
'<a>Jack</a>'
,
'/a[contains(../a,"j")]'
collate
latin1_bin
);
select
extractvalue
(
'<a>Jack</a>'
collate
latin1_bin
,
'/a[contains(../a,"j")]'
);
sql/item_xmlfunc.cc
View file @
6ef92d62
...
@@ -206,7 +206,11 @@ class Item_nodeset_func :public Item_str_func
...
@@ -206,7 +206,11 @@ class Item_nodeset_func :public Item_str_func
return
str
;
return
str
;
}
}
enum
Item_result
result_type
()
const
{
return
STRING_RESULT
;
}
enum
Item_result
result_type
()
const
{
return
STRING_RESULT
;
}
void
fix_length_and_dec
()
{
max_length
=
MAX_BLOB_WIDTH
;
}
void
fix_length_and_dec
()
{
max_length
=
MAX_BLOB_WIDTH
;
collation
.
collation
=
pxml
->
charset
();
}
const
char
*
func_name
()
const
{
return
"nodeset"
;
}
const
char
*
func_name
()
const
{
return
"nodeset"
;
}
};
};
...
@@ -2373,6 +2377,7 @@ void Item_xml_str_func::fix_length_and_dec()
...
@@ -2373,6 +2377,7 @@ void Item_xml_str_func::fix_length_and_dec()
xpath
.
cs
=
collation
.
collation
;
xpath
.
cs
=
collation
.
collation
;
xpath
.
debug
=
0
;
xpath
.
debug
=
0
;
xpath
.
pxml
=
&
pxml
;
xpath
.
pxml
=
&
pxml
;
pxml
.
set_charset
(
collation
.
collation
);
rc
=
my_xpath_parse
(
&
xpath
,
xp
->
ptr
(),
xp
->
ptr
()
+
xp
->
length
());
rc
=
my_xpath_parse
(
&
xpath
,
xp
->
ptr
(),
xp
->
ptr
()
+
xp
->
length
());
...
...
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