From: drh <drh@noemail.net>
Date: Wed, 8 Mar 2017 18:37:57 +0000 (+0000)
Subject: Merge recent enhancements from trunk, including the --preserve-rowids option
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb2c9aeddb8392555cc7e32a42f41b31bbe08c8;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk, including the --preserve-rowids option
to .dump and the .sha3sum commands of the CLI.

FossilOrigin-Name: 9b43917380ed60f11ebd8210bb7b9e444e1b9b0c
---

bfb2c9aeddb8392555cc7e32a42f41b31bbe08c8
diff --cc manifest
index 6772d6f1fe,4b1051a011..2d86bca364
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\spending\s3.18\senhancements\sfrom\strunk.
- D 2017-03-06T20:00:04.313
 -C Make\ssure\sthe\sdatabase\sconnection\sis\sopen\sprior\sto\srunning\sthe\s".sha3sum"\ncommand.
 -D 2017-03-08T18:06:20.965
 -F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
++C Merge\srecent\senhancements\sfrom\strunk,\sincluding\sthe\s--preserve-rowids\soption\nto\s.dump\sand\sthe\s.sha3sum\scommands\sof\sthe\sCLI.
++D 2017-03-08T18:37:57.666
 +F Makefile.in 0c27f4cee5d1d12f3a8d8fa88500c7264d2f4b36
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
 +F Makefile.msc ec6e29fe200869fd03cc41679a055c0f17ec9ea1
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -384,29 -383,28 +386,29 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
 +F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 85b19486054c8cd5c4117dea882d983ea065d16e
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 +F src/pager.c 8a4a3066cf9b06191b852dc0bdcb70a06de9c472
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
- F src/parse.y af8830094f4aecb91cb69721f3601ad10c36abc4
+ F src/parse.y 48b03113704ee8bd78ee6996d81de7fbee22e105
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c b7bf4f1dd9cdcdd3f72f0bdbce3502d69d0f48ba
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c 5e1dfb5a07753d70c48f596e1a367768e9434d88
++F src/pragma.c 69997bfa269233889d2019071550e249174c8491
  F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c 67427bbee66d891fc6f6f5aada857e9cdb368c1c
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
+ F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
- F src/shell.c 27d2b31099fd2cd749e44d025ef9b54ca26692cb
+ F src/shell.c 1160c054a483d15213ceb70fdbc383b07eebdf78
 -F src/sqlite.h.in 4d0c08f8640c586564a7032b259c5f69bf397850
 +F src/sqlite.h.in 329de1e75636972ba4b9388971ba47d3e2cb9116
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h df268ce1d04df042cf43b557d2309eb0b71e86c4
 +F src/sqliteInt.h 85eba6f13086a33be08ef7237af7b8be9884d0f3
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -479,9 -477,9 +481,9 @@@ F src/vdbesort.c eda25cb2d1727efca6f786
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
- F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
+ F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
  F src/where.c 1a3a8adb717a20f17c186f3baa22b0b5f3a5ab13
  F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
  F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
@@@ -1567,7 -1564,7 +1569,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 1913a7581024719ea31b7343b2a42a4b60c1c8eb 137aeb2b160888100bc1e871b00860149e5f6196
- R a6a1495a6ac1ed94de45cb652b36beb7
 -P 30f878832820ce7ccc4627c4f0f98fbe82f8b0f6
 -R 15b9925a544b33052292bf7b7cba23e6
++P 1650c3f468e6fc9bfed3dac469b32ae9f501f64e 2ea300fb8f7c497f3f092dc91f4305d8431c27d9
++R 13cb32973b901948d487c7a2cf4ace2c
  U drh
- Z 11654ff61593cf67481e1c8912084572
 -Z d079eee20e78bccc69196e077d629480
++Z d09f80e1fd5da95e763dcf07b95310d9
diff --cc manifest.uuid
index cea2a119b5,c9f050e5a9..0a112108d8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1650c3f468e6fc9bfed3dac469b32ae9f501f64e
 -2ea300fb8f7c497f3f092dc91f4305d8431c27d9
++9b43917380ed60f11ebd8210bb7b9e444e1b9b0c