From: drh <drh@noemail.net>
Date: Fri, 7 Jul 2017 14:26:43 +0000 (+0000)
Subject: Merge recent enhancements from trunk.
X-Git-Tag: version-3.20.0~62^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4676462f92b3e408e471daf1f78696ed57cf7b14;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk.

FossilOrigin-Name: 73d0fc027ddcc24e55cdc8c54443a96083cc9a29e57c0abe97e8586ff8a7f4c5
---

4676462f92b3e408e471daf1f78696ed57cf7b14
diff --cc manifest
index 9c7fc3fcfe,3c5acab3f4..15eb8aead4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthe\scarray()\sand\sremember()\sextension\sfunctions\sso\sthat\sthey\suser\nthe\snew\ssqlite3_value_pointer()\sinterface.
- D 2017-06-30T23:46:16.781
 -C Exploit\sthe\sfact\sthat\sExpr.pRight\sand\sExpr.x\sare\snever\sused\sat\sthe\ssame\stime\nfor\sa\ssmall\sperformance\sgain.
 -D 2017-07-07T13:59:34.309
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2017-07-07T14:26:43.473
  F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@@ -446,14 -446,14 +446,14 @@@ F src/pragma.h 99d3df4a3d2f12c5227ad403
  F src/prepare.c 4b84ae7458febe1df3e04ae62ba56abc851f771340e460d14426e6802c5615f4
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c d1e69759e7a79c156c692793f5d16f82f9a60ce5e82efd95e4374b2423034946
+ F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 741937503c74d85e64828b63d5a4219d3cfce480a717efef635839606001b1ba
+ F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
  F src/shell.c a2b148e4ca8eb81b96e1050207c83d4a16ea6bf9182374faee4dd2a43628c291
- F src/sqlite.h.in e1db5dd6c7058352f0853a789a1c5822a83c32450f0c30fa83dd74169e1d2e61
 -F src/sqlite.h.in 651cba56f8df64ff4418aa981cdfd5bc2d65e5fef95c1671f9826f1a164a5fa3
++F src/sqlite.h.in ed59e2ea714cb04d25cabce9aa7a684676253be9692cb14c9e43c039fabede51
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 37f1a9a3266aa7b11126585314cd98cf11ba6f174b1244de2221270107ea754d
+ F src/sqliteInt.h 7a7cd6f682471cce4afe64216f71fd64c622712aeb9d947c33c38337a7cf19a9
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1628,7 -1628,7 +1628,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d9f4a831ba957ead3890b36d0e33e30cfa4c79b7de6400e623b9746a0a5a02d0
- R b4c2909e137aa3ef17d38c2e54e31341
 -P 115d4b83392d346634866dd959bef30fca50db2e526df17eaeb3d94da7fc895e
 -R 582e201382f2bd562c6f1266d901f884
++P a99fa94db7185b8eaf3c9b184cb1479f8b3d5781f71f1717a4b3f2dd1d184fe4 aacbb9a461fdb34c7f9c8ce348e44c3e96c93334f210d438d92bfac1794dc686
++R de3235313da2edf0ec9dde1456ad1cbb
  U drh
- Z 8bdfe5f6d40ad5cfb9816549ee2c5181
 -Z 92ef67718e1f4940d85eca215e487e0c
++Z 209bf2cfeb4fa55eedc874c34ea72181
diff --cc manifest.uuid
index 3149df671b,9b3f91218c..def24a5f20
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a99fa94db7185b8eaf3c9b184cb1479f8b3d5781f71f1717a4b3f2dd1d184fe4
 -aacbb9a461fdb34c7f9c8ce348e44c3e96c93334f210d438d92bfac1794dc686
++73d0fc027ddcc24e55cdc8c54443a96083cc9a29e57c0abe97e8586ff8a7f4c5
diff --cc src/sqlite.h.in
index 18487082a6,a29ec7bc5a..a56895d940
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -4740,7 -4780,8 +4795,9 @@@ const unsigned char *sqlite3_value_text
  const void *sqlite3_value_text16(sqlite3_value*);
  const void *sqlite3_value_text16le(sqlite3_value*);
  const void *sqlite3_value_text16be(sqlite3_value*);
 +void *sqlite3_value_pointer(sqlite3_value*);
+ int sqlite3_value_bytes(sqlite3_value*);
+ int sqlite3_value_bytes16(sqlite3_value*);
  int sqlite3_value_type(sqlite3_value*);
  int sqlite3_value_numeric_type(sqlite3_value*);