database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Automatic merge, no conflicts

Browse Source
This commit is contained in:
Matthias Leich
2009-02-04 14:20:05 +01:00
parent 2df0beee02 1177405381
commit 7957622bfd
5 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@@ -1528,8 +1528,8 @@ sub mysql_fix_arguments () {
mtr_init_args(\$args); mtr_init_args(\$args);
mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
mtr_add_arg($args, "--basedir=", $basedir); mtr_add_arg($args, "--basedir=%s", $basedir);
mtr_add_arg($args, "--bindir=", $path_client_bindir); mtr_add_arg($args, "--bindir=%s", $path_client_bindir);
mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--verbose");
return mtr_args2str($exe, @$args); return mtr_args2str($exe, @$args);
} }

11
mysql-test/r/xml.result
View File

@@ -1053,4 +1053,15 @@ ExtractValue('<xml xxx "yyy">CharData</xml>', '/xml')
NULL NULL
Warnings: Warnings:
Warning 1525 Incorrect XML value: 'parse error at line 1 pos 17: STRING unexpected ('>' wanted)' Warning 1525 Incorrect XML value: 'parse error at line 1 pos 17: STRING unexpected ('>' wanted)'
set @x=10;
select extractvalue('<a></a>','$@x/a');
ERROR HY000: XPATH syntax error: '/a'
select extractvalue('<a></a>','round(123.4)/a');
ERROR HY000: XPATH syntax error: '/a'
select extractvalue('<a></a>','1/a');
ERROR HY000: XPATH syntax error: '/a'
select extractvalue('<a></a>','"b"/a');
ERROR HY000: XPATH syntax error: '/a'
select extractvalue('<a></a>','(1)/a');
ERROR HY000: XPATH syntax error: '/a'
End of 5.1 tests End of 5.1 tests

14
mysql-test/t/xml.test
View File

@@ -575,5 +575,19 @@ SELECT ExtractValue(@xml, 'html/body');
SELECT ExtractValue('<xml "xxx" "yyy">CharData</xml>', '/xml'); SELECT ExtractValue('<xml "xxx" "yyy">CharData</xml>', '/xml');
SELECT ExtractValue('<xml xxx "yyy">CharData</xml>', '/xml'); SELECT ExtractValue('<xml xxx "yyy">CharData</xml>', '/xml');
#
# Bug#42495 updatexml: Assertion failed: xpath->context, file .\item_xmlfunc.cc, line 2507
#
set @x=10;
--error ER_UNKNOWN_ERROR
select extractvalue('<a></a>','$@x/a');
--error ER_UNKNOWN_ERROR
select extractvalue('<a></a>','round(123.4)/a');
--error ER_UNKNOWN_ERROR
select extractvalue('<a></a>','1/a');
--error ER_UNKNOWN_ERROR
select extractvalue('<a></a>','"b"/a');
--error ER_UNKNOWN_ERROR
select extractvalue('<a></a>','(1)/a');
--echo End of 5.1 tests --echo End of 5.1 tests

11
sql-bench/bench-init.pl.sh
View File

@@ -47,7 +47,7 @@ $opt_machine=""; $opt_suffix="";
$opt_create_options=undef; $opt_create_options=undef;
$opt_optimization="None"; $opt_optimization="None";
$opt_hw=""; $opt_hw="";
$opt_threads=5; $opt_threads=-1;
if (!defined($opt_time_limit)) if (!defined($opt_time_limit))
{ {
@@ -68,6 +68,11 @@ $limits=merge_limits($server,$opt_cmp);
$date=date(); $date=date();
@estimated=(0.0,0.0,0.0); # For estimated time support @estimated=(0.0,0.0,0.0); # For estimated time support
if ($opt_threads != -1)
{
print "WARNING: Option --threads is deprecated and has no effect\n"
}
if ($opt_hires) if ($opt_hires)
{ {
eval "use Time::HiRes;"; eval "use Time::HiRes;";
@@ -560,8 +565,8 @@ All benchmarks takes the following options:
Inform test suite that we are generate random inital values for sequence of Inform test suite that we are generate random inital values for sequence of
test executions. It should be used for imitation of real conditions. test executions. It should be used for imitation of real conditions.
--threads=# (Default 5) --threads=# **DEPRECATED**
Number of threads for multi-user benchmarks. This option has no effect, and will be removed in a future version.
--tcpip --tcpip
Inform test suite that we are using TCP/IP to connect to the server. In Inform test suite that we are using TCP/IP to connect to the server. In

8
sql/item_xmlfunc.cc
View File

@@ -1969,6 +1969,13 @@ my_xpath_parse_FilterExpr_opt_slashes_RelativeLocationPath(MY_XPATH *xpath)
if (!my_xpath_parse_term(xpath, MY_XPATH_LEX_SLASH)) if (!my_xpath_parse_term(xpath, MY_XPATH_LEX_SLASH))
return 1; return 1;
if (xpath->item->type() != Item::XPATH_NODESET)
{
xpath->lasttok= xpath->prevtok;
xpath->error= 1;
return 0;
}
my_xpath_parse_term(xpath, MY_XPATH_LEX_SLASH); my_xpath_parse_term(xpath, MY_XPATH_LEX_SLASH);
return my_xpath_parse_RelativeLocationPath(xpath); return my_xpath_parse_RelativeLocationPath(xpath);
} }
@@ -1976,7 +1983,6 @@ static int my_xpath_parse_PathExpr(MY_XPATH *xpath)
{ {
return my_xpath_parse_LocationPath(xpath) || return my_xpath_parse_LocationPath(xpath) ||
my_xpath_parse_FilterExpr_opt_slashes_RelativeLocationPath(xpath); my_xpath_parse_FilterExpr_opt_slashes_RelativeLocationPath(xpath);
} }