From ceb97c110715008c71e79d6f84936c42e10501b8 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 21 Oct 2016 10:09:22 +0000 Subject: [PATCH] If SQLITE_DIRECT_OVERFLOW_READ is defined at compile time, add "DIRECT_OVERFLOW_READ" to the list of symbols returned by "PRAGMA compile_options". FossilOrigin-Name: b7d9727bff2e840af4b090872c991693e78e6076 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/ctime.c | 3 +++ test/ctime.test | 12 ++++++++++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a415c87dce..d7a058afaa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stest\scase\sto\sincrblob4.test.\sNo\schanges\sto\scode. -D 2016-10-20T11:48:48.196 +C If\sSQLITE_DIRECT_OVERFLOW_READ\sis\sdefined\sat\scompile\stime,\sadd\s"DIRECT_OVERFLOW_READ"\sto\sthe\slist\sof\ssymbols\sreturned\sby\s"PRAGMA\scompile_options". +D 2016-10-21T10:09:22.112 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -335,7 +335,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 +F src/ctime.c 72c9d01cf446069234e9b54db6fec3e1fc063f58 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec @@ -621,7 +621,7 @@ F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2 F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348 -F test/ctime.test 0b995accd44a52914bd4744d5c1b6e1a56c7897c +F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856 F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255 F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65 @@ -1526,7 +1526,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 56474ebca3fdddb8f3c5156f06dc42dc0a65256c -R 6a7bc6f89b0af2fdd2ebad96f33dfe0d +P fd9c6ff05f2052810549a1a6a384f4b40f4ba4ac +R 4fbfeb317fb8029064d3b09d0cf024a2 U dan -Z c3391a8802a4551fd3ff33c7d0504831 +Z 8fb3e008f86324b83c8c0293ad05a979 diff --git a/manifest.uuid b/manifest.uuid index fbad17e2f8..dafccbb10c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fd9c6ff05f2052810549a1a6a384f4b40f4ba4ac \ No newline at end of file +b7d9727bff2e840af4b090872c991693e78e6076 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 09587ea88e..55ae13af77 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -66,6 +66,9 @@ static const char * const azCompileOpt[] = { #if defined(SQLITE_DEFAULT_MMAP_SIZE) && !defined(SQLITE_DEFAULT_MMAP_SIZE_xc) "DEFAULT_MMAP_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_MMAP_SIZE), #endif +#if SQLITE_DIRECT_OVERFLOW_READ + "DIRECT_OVERFLOW_READ", +#endif #if SQLITE_DISABLE_DIRSYNC "DISABLE_DIRSYNC", #endif diff --git a/test/ctime.test b/test/ctime.test index efdf170851..8ed556358f 100644 --- a/test/ctime.test +++ b/test/ctime.test @@ -224,5 +224,17 @@ do_test ctime-2.5.$tc { } ] } {0 {{}}} +#-------------------------------------------------------------------------- +# Test that SQLITE_DIRECT_OVERFLOW_READ is reflected in the output of +# "PRAGMA compile_options". +# +ifcapable direct_read { + set res 1 +} else { + set res 0 +} +do_test ctime-3.0.1 { + expr [lsearch [db eval {PRAGMA compile_options}] DIRECT_OVERFLOW_READ]>=0 +} $res finish_test