Merge the beta changes into sessions.

FossilOrigin-Name: beb5ea1439995fb8ab112451a8ffcc08fe42d0c4

diff --cc manifest
index 561e39edc2055e477d314575ad8db6dd1b6f073f,f86978ab0653576df03d42947309f0882babfb0b..ff14539e1222ad35cc9f3edc133b3ee2b6c52fe0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\s3.12.0\sbeta\schanges\sfrom\strunk.
- D 2016-03-21T15:32:19.793
 -C Avoid\scalling\srealloc()\swith\sa\szero\ssize\sin\sfuzzcheck.c.
 -D 2016-03-23T17:54:19.633
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\sthe\sbeta\schanges\sinto\ssessions.
++D 2016-03-24T14:34:26.863
 +F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
 +F Makefile.msc e6ee58b849c116d5554024f524cbf61f064f6f01
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -333,10 -315,10 +335,10 @@@ F src/global.c 884d4c7eba9f5fc25c96a23b
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 +F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c e70f8f9e97624a232870ea5486e682c813ac3002
- F src/main.c 915aeae74e2526b8fa33f9b99b1ed13eab968ac2
 -F src/main.c 63791c66321f07b5828bb9161b477d5e0b511d7e
++F src/main.c 5ac9dccc03faadd6f867f67b9018ff41eeeadb46
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -371,16 -353,16 +373,16 @@@ F src/printf.c 63e6fb12bbe702dd664dc370
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
+ F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143
 -F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
 +F src/shell.c cd3f82fdc5c895b817a375b7ab8319cb41f447ce
 +F src/sqlite.h.in a1d7a367997f80c7075303aaf73e5fc46261c11c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h f5cebbea5909189efbffd7a659195436f503ebb7
- F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
 -F src/sqliteInt.h 3a68b48967a7d62fcb38572d27fd21ab4e4bcca3
++F src/sqliteInt.h 410bd07098423b887874d9d2ff9ed6f8e3284839
+ F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
 -F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
 +F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
  F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
@@@ -433,20 -415,20 +435,20 @@@ F src/threads.c 4ae07fa022a3dc7c5beb373
  F src/tokenize.c 3d338cdd00d916ce8a05c397001d64ed58e6fe1c
  F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 -F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
 +F src/update.c 14c6916d0194a7f25ad429292f4831b8c31e93d9
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c cf7dce85ab9af5280b8a45985df2591efbfefe56
+ F src/util.c 8873d696c9ccc4206058c402e09e101f1b81561a
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c f19741f2d8b33e8f09cd2219570b6c9ed924c3f1
 -F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
 -F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 -F src/vdbeaux.c c8dd3e4e932bede6363b380519d05c0557ad27ce
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c fe76c1f866de362d9b8332e59d74aa44f6560d69
 +F src/vdbe.c 399bb1d353da8ce2e52e5182aabca18da0296749
 +F src/vdbe.h c16ba943d407baa1c7085eefea73a063fc631863
 +F src/vdbeInt.h 9b704336a69f62ba189eafb06a46171e3463d27b
 +F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeaux.c 03b2a622bf7714153bf06f9a6789e94aad9a5f89
 +F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 +F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
+ F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
@@@ -1478,7 -1459,7 +1480,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 6a7ee04b0ddac36a87d5ed2ac89a53e537f4d5a3 4bd12b57ea177cfb1f44d54bfa7aedfb8a8c0c64
- R 23117f3fb3eb670baa9fc58a11fb65fe
 -P 3fa88f68c3e1bbb3421cb0d2b82b9bb3fe7b9b14
 -R 6050811335a4694faefeb0d2dc871228
++P 3296a0ceedef43c2790f0b36471f91138a575243 a1fd14694c1adc54e5c443ebfdef38e38637f5c5
++R 6a48044d31c7e4e91715fbb78d5dfd9f
  U drh
- Z 887267d056670df55047d1f847ebaae7
 -Z bf4eed3170d70e06db77678976293947
++Z be6e3e57ab02c83f1495f1c79794042e

diff --cc manifest.uuid
index d75bc5442cbe95dbab57386c886e8b00666426bd,fc3163dd807a62afcdfdc5106604e362147d4404..ca271aa92a45e2e0c61319a1362f219d860af47d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3296a0ceedef43c2790f0b36471f91138a575243
 -a1fd14694c1adc54e5c443ebfdef38e38637f5c5
++beb5ea1439995fb8ab112451a8ffcc08fe42d0c4

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge