From: dan Date: Thu, 5 Jan 2017 20:00:08 +0000 (+0000) Subject: Ensure that sqlite3_column_count() returns 0 for the "set" mode of "get/set" X-Git-Tag: version-3.17.0~132 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b64313b8dfdc4a60dbf91d029c3244bd6af6d67;p=thirdparty%2Fsqlite.git Ensure that sqlite3_column_count() returns 0 for the "set" mode of "get/set" PRAGMA statements that do not return a value in that case (e.g. page_size, cache_size, auto_vacuum). FossilOrigin-Name: 2f57939a5583ae420b525c7e0f0dcda8626fe992 --- 2b64313b8dfdc4a60dbf91d029c3244bd6af6d67 diff --cc manifest index a63cb41c6a,11b3fdb8d5..7c8102a95e --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Fix\shandling\sthe\scase\swhere\sa\ssub-query\sin\sa\sFROM\sclause\sis\sitself\sa\sUNION\nALL,\sand\sone\sside\sof\sthat\sUNION\sALL\sis\sa\squery\son\sa\sview\sthat\sincludes\san\nORDER\sBY.\sFix\sfor\sticket\s[190c2507]. - D 2017-01-05T17:23:11.079 + C Ensure\sthat\ssqlite3_column_count()\sreturns\s0\sfor\sthe\s"set"\smode\sof\s"get/set"\nPRAGMA\sstatements\sthat\sdo\snot\sreturn\sa\svalue\sin\sthat\scase\s(e.g.\spage_size,\ncache_size,\sauto_vacuum). -D 2017-01-05T19:32:48.544 ++D 2017-01-05T20:00:08.469 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@@ -1542,7 -1543,10 +1543,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 571f166ea8721e2322965b6f23e758b78d13baca - R 5877f43df188f502f476d2f10520ec1c -P 590ca83b8e8cdd5d24ed7f10f43e540aa0627f22 ++P 590ca83b8e8cdd5d24ed7f10f43e540aa0627f22 5c05d8ec5e895661dae2de30c73dfdeaff93511e + R 3cc0f54ce943c87173e4fcd78a65cfb2 -T *branch * pragma-columncount-fix -T *sym-pragma-columncount-fix * -T -sym-trunk * ++T +closed 5c05d8ec5e895661dae2de30c73dfdeaff93511e U dan - Z 5cce284946e3a767bc44d73b1e732025 -Z 05a2a3933bf879333729a3bc0a191043 ++Z 32693c8b1d3e16da4e9a701cf8e54e3f diff --cc manifest.uuid index b593a2938f,56d578e48a..f5231b6587 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 590ca83b8e8cdd5d24ed7f10f43e540aa0627f22 -5c05d8ec5e895661dae2de30c73dfdeaff93511e ++2f57939a5583ae420b525c7e0f0dcda8626fe992