Author: svn-role
Date: Fri Sep 20 04:00:29 2019
New Revision: 1867195
URL: http://svn.apache.org/viewvc?rev=1867195&view=rev
Log:
Merge r1852013 from trunk:
* r1852013
Fix issue #4804: avoid test failures just because some SQLite compile-time
feature was enabled that changes its query plan descriptions.
Justification:
Reported build failure on Gentoo Linux, see:
https://bugs.gentoo.org/605438
Votes:
+1: brane, stsp
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/tests/libsvn_wc/wc-queries-test.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 20 04:00:29 2019
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845212,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1853761
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845212,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1852013,1853761
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1867195&r1=1867194&r2=1867195&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 20 04:00:29 2019
@@ -69,15 +69,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1852013
- Fix issue #4804: avoid test failures just because some SQLite compile-time
- feature was enabled that changes its query plan descriptions.
- Justification:
- Reported build failure on Gentoo Linux, see:
- https://bugs.gentoo.org/605438
- Votes:
- +1: brane, stsp
-
* r1853483
Fix #4760 "Missing children when svnadmin dump --include/exclude converts
copy-dir to add-dir".
Modified:
subversion/branches/1.11.x/subversion/tests/libsvn_wc/wc-queries-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1867195&r1=1867194&r2=1867195&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/tests/libsvn_wc/wc-queries-test.c
(original)
+++ subversion/branches/1.11.x/subversion/tests/libsvn_wc/wc-queries-test.c Fri
Sep 20 04:00:29 2019
@@ -670,7 +670,20 @@ test_query_expectations(apr_pool_t *scra
|| (item->expression_vars < 1))
&& !is_result_table(item->table))
{
- if (in_list(primary_key_statements, i))
+ if (MATCH_TOKEN(item->table, "sqlite_master"))
+ {
+ /* The sqlite_master table does not have an index.
+ Query explanations that say 'SCAN TABLE sqlite_master'
+ will appear if SQLite was compiled with the option
+ SQLITE_ENABLE_STMT_SCANSTATUS, for queries such
+ as 'DROP TABLE foo', but the performance of such
+ statements is not our concern here. */
+
+ /* "Slow" statements do expect too see a warning, however. */
+ if (is_slow_statement(i))
+ warned = TRUE;
+ }
+ else if (in_list(primary_key_statements, i))
{
/* Reported as primary key index usage in Sqlite 3.7,
as table scan in 3.8+, while the execution plan is
