Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: eb036d6f81e15bac013316bf5b1b2ba3e0bd4605

diff --cc main.mk
Simple merge

diff --cc manifest
index 66407107f14cd4efd73fda807ab4c89a35f866e2,91a0745b81ca68517e86974a4da685708511e355..3f34ca057c76d7b80862eb10366757263b6ff082
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Update\scompiler\serror\smessage\sregarding\sthe\schoice\sof\smemory\sallocator\sdefines.
 -D 2011-08-26T11:25:02.455
 +C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-08-03T21:46:58.295
++D 2011-08-26T19:20:47.301
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
+ F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 8e04f517922b9e31a5bf975f07bb66df79ae7076
+ F Makefile.msc 55fe94bf23b4c1ff035f19b0ae2ea486350f8d01
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@@ -102,21 -102,9 +102,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 891453e96630ee2915081487fc4b7226f0aa252f
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 47bb833f273c17812370a750b1a697cd14580b75
 -F main.mk 201b1d81aa4ac0af21b243151e79477c14ce3722
++F main.mk cb6055cd875d73dee78a7f88c04cd49457d8cc9a
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -133,21 -121,21 +133,21 @@@ F src/alter.c ac80a0f31189f8b4a524ebf66
  F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
+ F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 8c46f0ab69ad9549c75a3a91fed87abdaa743e2f
- F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
+ F src/btree.c ed13fdefdbe671d5777773dcfb3a162ddb4623ae
+ F src/btree.h 9ddf04226eac592d4cc3709c5a8b33b2351ff5f7
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 5e614e586d9f8a81c16c80b545b9e1747f96c1bb
+ F src/build.c 2d5de52df616a3bf5a659cbca85211c46e2ba9bd
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
+ F src/ctime.c caf51429be3e0d4114056a8273b0fff812ff8ae9
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
  F src/expr.c 4bbdfaf66bc614be9254ce0c26a17429067a3e07
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c8492fed772af1ed61251582707266227612b45b
+ F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
  F src/global.c c70a46f28680f8d7c097dbc0430ccf3b932e90b0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
@@@ -158,7 -146,7 +158,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 99a161b27a499fc8ad40745b7b1900a26f0a5f51
- F src/main.c 8a386605c22e4b2becfe96bab2ac7128b480d489
 -F src/main.c 43664b68a0b0f8fe9edc7d987b42cb8e26298468
++F src/main.c 13b9a1d38084dd4996ad5f759c4b0e1fc1c010c0
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -193,14 -181,14 +193,14 @@@ F src/resolve.c 36368f44569208fa074e61f
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
- F src/sqlite.h.in db27d510c1016b3dfbac947bccfe7b648d1fa478
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
++F src/sqlite.h.in 355493ac9492746a0bbd17a4fd40911aa89b5a3a
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 113559f0c2202c4e648b5d647d7b2409604fb516
 -F src/sqliteInt.h 86a4fdb3ba9ab31d98b266797606f30fefe5b8a9
++F src/sqliteInt.h a6f805d591b7b71703eb33dd9cd60ced889b71c6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c e85bada4bf1796274a2cd7b3db9a663f8df31880
- F src/test1.c e7ea726d26b9007bae7907d8b40280c70ec6c504
 -F src/tclsqlite.c 3ef1dda2f1dc207c792eaadebf9d8adc44648581
++F src/tclsqlite.c be0e691e223a907aa032c7b3ed310dc0ff048109
+ F src/test1.c 7439efb86c1022f19a39a8e61de2cbac23ffab03
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -213,7 -201,7 +213,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 70c74ef7a696c1b40d6415d48ee4c8f668cd16a8
 -F src/test_config.c e342660556d64365aacea2b23cbb5e6654d7278f
++F src/test_config.c fc48c199ad4b88c99bf7c727cae407ca53145c3d
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -250,13 -238,14 +250,14 @@@ F src/update.c 2d67e24d5a44d8b1c0839bf2
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c 303d8b3bc93a464739c03b2fff51d360dcf1a163
- F src/vdbe.h 322af148cceef120bb1ec9cff7f122e76abf94da
- F src/vdbeInt.h 3de6588b36c833969aebab202e1766d586c37ec2
 -F src/vdbe.c 4a7191c0f8e918b74e8c84cbdd77746d6b7e3bcf
 -F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4
 -F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 11b0df8822ecf61e543562247207df75e2ebb617
 -F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
++F src/vdbe.c 9bc9b5f1231b9ea1bd35fecb775cce970fe47ac7
++F src/vdbe.h ee8ba0243ff76fae3af1d020c8d82d8368a2a744
++F src/vdbeInt.h 1b36e54662ef3ee5c9ce4a5933e122ffb8782b93
 +F src/vdbeapi.c ddd061183e2c3015f676e53ee85fcaf306617e8e
- F src/vdbeaux.c 7d0b75a04ac466d25a90fefd1df83361a2ab0ad7
++F src/vdbeaux.c 4b5f0e80af001976d61ecb1c1e44c03dd7cb3d16
 +F src/vdbeblob.c fde0374afb0c512614aed191ac2683f6772d2b8f
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
+ F src/vdbesort.c 8a61a6d731cbe612217edf9eece6197f37c9489e
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
  F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
@@@ -503,9 -492,9 +504,9 @@@ F test/fuzz.test 77fd50afc12847af50fcf1
  F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
- F test/fuzz_malloc.test dd7001ac86d09c154a7dff064f4739c60e2b312c
+ F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
  F test/fuzzer1.test ddfb04f3bd5cfdda3b1aa15b78d3ad055c9cc50f
- F test/hook.test 4fd80e9c3ffb49de0379e2a026ef2fe7b9f3e534
 -F test/hook.test 5f3749de6462a6b87b4209b74adf7df5ac2df639
++F test/hook.test 94b927b15883f5c1477ab09eecd16275addb08f4
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 19b642bb134308980a92249750ea4ce3f6c75c2d
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -625,12 -616,12 +628,12 @@@ F test/pagerfault.test 452f2cc23e3bfcfa
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
- F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
+ F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
- F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test f9ad1fcadd10a7fd4014de58e61178c3329a5c03
- F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
- F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
+ F test/pcache2.test bc67c6802989dba05cdf3a4574fd882e238c7ecf
 -F test/permutations.test ad17319066a90e2db71823c3ff104795ffc71b31
++F test/permutations.test 97d576e6384f1779e4428516a48458ce8cf7dfd1
+ F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
+ F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@ -671,13 -662,12 +674,13 @@@ F test/selectA.test 06d1032fa9009314c95
  F test/selectB.test 0d072c5846071b569766e6cd7f923f646a8b2bfa
  F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
  F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
- F test/shared.test b9114eaea7e748a3a4c8ff7b9ca806c8f95cef3e
- F test/shared2.test 7f6ad2d857d0f4e5d6a0b9a897b5e56a6b6ea18c
- F test/shared3.test d69bdd5f156580876c5345652d21dc2092e85962
- F test/shared4.test d0fadacb50bb6981b2fb9dc6d1da30fa1edddf83
- F test/shared6.test 990d2584b5db28e6e1f24742c711b26e59757b67
- F test/shared7.test 8114027cb5e8c376e467115703d46e5ac4e77739
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
+ F test/shared.test 34945a516532b11182c3eb26e31247eee3c9ae48
+ F test/shared2.test 8f71d4eb4d5261280de92284df74172545c852cc
+ F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
+ F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
+ F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
+ F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
  F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
  F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
@@@ -700,21 -690,21 +703,21 @@@ F test/subquery.test b524f57c9574b2c034
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
- F test/sync.test 2bd73b585089c99e76b3e1796c42059b7d89d872
- F test/syscall.test 707c95e4ab7863e13f1293c6b0c76bead30249b3
+ F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
+ F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
- F test/table.test 04ba066432430657712d167ebf28080fe878d305
+ F test/table.test 50c47f5fe9c112e92723af27cd735e6c92de6f85
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
- F test/tclsqlite.test 1ce9b6340d6d412420634e129a2e3722c651056a
 -F test/tclsqlite.test 5ebcbb0dccc3fbc1edc3bba84c38e2c2d574c5aa
++F test/tclsqlite.test d5298750115768bca173da8043ffac2924be21a0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
- F test/temptable.test 1a21a597055dcf6002b6f1ee867632dccd6e925c
- F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 3b6143fdafff36c516cf0fd663a20cd420aae36f
+ F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
+ F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
 -F test/tester.tcl 0b2999b578964297663de4870babbbee29225622
++F test/tester.tcl 8db832ad03331dcae2f39b435feb2f789cd4e8d9
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
- F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
- F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
+ F test/thread002.test 716631b06cccf33b368ab7f6dd3cad92907b8928
+ F test/thread003.test 33d2d46e6a53ccb2ff8dc4d0c4e3b3aaee36dcd1
  F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
- F test/thread005.test bf5c374ca65dd89fd56c8fe511ccfb46875bda5e
+ F test/thread005.test 50d10b5684399676174bd96c94ad4250b1a2c8b6
  F test/thread1.test df115faa10a4ba1d456e9d4d9ec165016903eae4
  F test/thread2.test f35d2106452b77523b3a2b7d1dcde2e5ee8f9e46
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
@@@ -967,8 -960,8 +973,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 62c446340475b52b843c0345eda32ebe86fa9159 a2135ad13049c170b33315a949b1544e6a136183
- R 734a54c8f931fe24e65682db655c7b9e
+ F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P 5238a74987507f27af4080e2842f53e049b5b111
 -R 68d004e4a18ddd9b15416c3d56993539
 -U mistachkin
 -Z cf5bdd8db49b4512fd908f85b844bfec
++P c5709036087b6b4fb6391ab7e4b4b870aac87a31 1dada5158215d1816edb69ff2610f9d2259ce19d
++R a4d0f9879dd116c25d083f8cdc0d0501
 +U drh
- Z 34a261d71dea5b8394b2283d95dc3275
++Z 0ce927a650c1609d421fc43e47e08b7b

diff --cc manifest.uuid
index 81043c95b6b2b957c4865af8e2518fbd0175e6e9,3413c7f0936ebe41a6acbedc4cbddb990f3cca5a..8f69556b5d97af493a3e2e5bd90b6f3229f391a7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c5709036087b6b4fb6391ab7e4b4b870aac87a31
 -1dada5158215d1816edb69ff2610f9d2259ce19d
++eb036d6f81e15bac013316bf5b1b2ba3e0bd4605

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
index 62f2c105ba409d4943ae60dec2e2acb1344d8b05,11a22bc972320b7d8444ca88a3de5d42e951a192..92bc34d786c1c9cb69cb7c877866e9d84cc214c0
--- 1/src/vdbeInt.h
--- 2/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -406,9 -391,23 +410,25 @@@ int sqlite3VdbeCloseStatement(Vdbe *, i
  void sqlite3VdbeFrameDelete(VdbeFrame*);
  int sqlite3VdbeFrameRestore(VdbeFrame *);
  void sqlite3VdbeMemStoreType(Mem *pMem);
 +void sqlite3VdbePreUpdateHook(
 +    Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int);
  
+ #ifdef SQLITE_OMIT_MERGE_SORT
+ # define sqlite3VdbeSorterInit(Y,Z)      SQLITE_OK
+ # define sqlite3VdbeSorterWrite(X,Y,Z)   SQLITE_OK
+ # define sqlite3VdbeSorterClose(Y,Z)
+ # define sqlite3VdbeSorterRowkey(Y,Z)    SQLITE_OK
+ # define sqlite3VdbeSorterRewind(X,Y,Z)  SQLITE_OK
+ # define sqlite3VdbeSorterNext(X,Y,Z)    SQLITE_OK
+ #else
+ int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *);
+ int sqlite3VdbeSorterWrite(sqlite3 *, VdbeCursor *, int);
+ void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *);
+ int sqlite3VdbeSorterRowkey(VdbeCursor *, Mem *);
+ int sqlite3VdbeSorterRewind(sqlite3 *, VdbeCursor *, int *);
+ int sqlite3VdbeSorterNext(sqlite3 *, VdbeCursor *, int *);
+ #endif
+ 
  #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0
    void sqlite3VdbeEnter(Vdbe*);
    void sqlite3VdbeLeave(Vdbe*);

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/hook.test
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tclsqlite.test
Simple merge

diff --cc test/tester.tcl
Simple merge