Merge all recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 0e14fe1b986abf1449d727fbe04c6a939ed209a2

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 83e4ab857b86d4d9e83d84252e82f0e923c11394,1c84aea007b33376a4116247231e69ab6f185b5e..5b259269f38c3fe6254962972f6df9e0e8b32f28
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\schanges\sfor\sversion\s3.16.2.
- D 2017-01-06T17:01:53.000
- F Makefile.in 6107f11b53eb2067c13b84c7c5b88c9a7764728a
 -C Alternative\sICU\sfix\s(compare\sto\scheck-in\s[50e60cb4])\sthat\savoids\scasting\nintegers\sto\spointers.
 -D 2017-01-27T13:14:12.467
 -F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2017-01-27T16:39:38.607
++F Makefile.in 3fc65e1d80b5937998f15f7e4c97ee6471e291a4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
 +F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 5c92800c89751cee56a70d8e1eab9b3c09b1df22
+ F VERSION cddd8d88dc8202afa0ebc96da61fc4acbd1e96a5
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -306,16 -308,13 +308,16 @@@ F ext/session/sessionfault2.test 04aa0b
  F ext/session/sqlite3session.c c61a43396368ec00dc127f7bc647e9bd6a4ee5fb
  F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2
  F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
- F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
+ F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a3bcc219fb5a9af18c74cccff2f203a9353fb6c8
 -F main.mk afc52937b4e5fe08678e8d5a4fe4487d44e3bc61
++F main.mk f5ae2a0ddfe215ac23a9c1384e56a16b108e84f9
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -333,9 -332,9 +335,9 @@@ F src/attach.c 8c476f8bd5d2afe11d925f89
  F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
- F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 95ffea8c0d34a07aa2858717f01f72889ff68b2e
- F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
+ F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 -F src/btree.c 6a63fa34e6fe86e87090e41963c0f2fcf9d3e16d
++F src/btree.c a018a533bb691092144bb363f7079fd19a5a777a
+ F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
  F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
@@@ -353,11 -352,11 +355,11 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 7af46a3be2656f5e13791464625d93d6b07b8612
+ F src/insert.c 8183e1778ec42d26732bec8c98aeffa8af13038f
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
+ F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 -F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
 +F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
- F src/malloc.c f3fad34cd570022abca558c573f1761fb09a8212
+ F src/malloc.c fc1b9f445290f2145da48fc08730c26e6082b640
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -375,34 -374,33 +377,34 @@@ 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 cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 +F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c e2da02d2e731bd111383578a1dd2f0a58fd3d4c1
- F src/pager.h 366f586bbcb92b797b954d95bf322083e8e5cf5c
 -F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
++F src/pager.c 8a4a3066cf9b06191b852dc0bdcb70a06de9c472
++F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
  F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
  F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c 0e7a7c6f1c6fd8ff50c0fff65b8bb80174bc49c5
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
 +F src/pragma.c 74f24422fcac808e9026dcf7c36c70ff00d67497
  F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
- F src/printf.c 0c8579432f47948d9be5077eb590e8c4a01be667
+ F src/printf.c ff10a9b9902cd2afe5f655f3013c6307d969b1fd
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
+ F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 4437d9d5d56b6ffdedabf394c7fe3a07ff521ce9
- F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
- F src/sqlite.h.in 353a46ff31f2e974b4a67c5d24bc38fe848a3a76
+ F src/select.c 3856db523b942062bca8722ba03b61c324ff94d6
+ F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
 -F src/sqlite.h.in 1971ab9709e010d52a02a1a6276d5a2f9b947476
++F src/sqlite.h.in 30cc134c53356f8097edb7d9b030b55199601da9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 25ec82510aed8458adfd1efda99c44b66309a22a
 -F src/sqliteInt.h 341ce9e5b0397771fa6bd9dadb8ef4cbbd6224d0
++F src/sqliteInt.h da2cbcedaef16e47cf19abdbefe878fb8fb696cf
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
- F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174
+ F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
+ F src/tclsqlite.c 418f5e5e0840425a7e5b33f3600dccd378a57549
 -F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d
 +F src/test1.c c5700d147d3156a93485f9cb6ec397b151841c96
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -417,8 -415,8 +419,8 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c 6a4c7920d1d9c6cc0f7aa50c89c4f80016aeda83
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 83179ea845479b5be9a651d014649e3f2722a1fe
 +F src/test_config.c 58800d20433a5af029aad7e937fabf5a4b8ab5ef
- F src/test_delete.c 8499d4d323f2ec8e28301deb3d6ddd8eef8b8139
+ F src/test_delete.c af7eab5702f853fb1c62a5f7665e2234cf1ae17b
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -441,8 -439,8 +443,8 @@@ F src/test_quota.h 2a8ad1952d1d2ca9af0c
  F src/test_rtree.c 671f3fae50ff116ef2e32a3bf1fe21b5615b4b7b
  F src/test_schema.c f575932cb6274d12147a77e13ea4b49d52408513
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
- F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
+ F src/test_sqllog.c 11e6ce7575f489155c604ac4b439f2ac1d3d5aef
 -F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
 +F src/test_superlock.c 793bb9d43a924c21993bcd6c2e200d3db8abf34e
  F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
  F src/test_tclvar.c df9fe1213c2634687a9ca0b0bec0d2119d359ae3
  F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
@@@ -455,30 -453,31 +457,31 @@@ F src/threads.c 4ae07fa022a3dc7c5beb373
  F src/tokenize.c 5c2f516876fc27fbd7753913f032f49eb89e83b5
  F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
- F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8
+ F src/update.c b356b29d04c71f33c779f2cb557cf953819bdd7a
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 1534060bc034cdc51381c040c8bd6252dbcb64c9
+ F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 5870d9f62f5c0b9fd25d41ca47b92314bf045b5b
- F src/vdbe.h b0866e4191f096f1c987a84b042c3599bdf5423b
 -F src/vdbe.c c27cc34be1d9169c1c191238025781684bdcd4ec
++F src/vdbe.c 761edd8fd90526e1850dfacaef527e7ebd7208cb
+ F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
- F src/vdbeapi.c fe1a1ebda30a22c9a20ebf8cf2d88b2685c01bb8
- F src/vdbeaux.c 35c9a9908174e5a26c96d15e1f98214814a39147
- F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
 -F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
 -F src/vdbeaux.c 6847b02aa2db536ed15d90f1fdc2923afef93c5b
++F src/vdbeapi.c 46cdfab63a43ae48977bfd4cdf471aba23a59aae
++F src/vdbeaux.c 57a43a29be82a4bf7cd2e9f949ecd71fc701af5f
+ F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
  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/where.c 6bbf9284f4f15a6fa48663d033870cc0d7f5ee66
+ F src/where.c bc71775e23d23334e8f449aa31012d692dc09cb2
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
  F src/wherecode.c e04ac8f24c3ac8621df6c3be3ac8c7d4fa893745
- F src/whereexpr.c 87ecdf24beba4498e4380b31c4131febb0a6ceaa
+ F src/whereexpr.c 35ad025389a632a3987a35617c878be3b3d70dc6
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
+ F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -628,9 -627,9 +631,9 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
 -F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54
 +F test/ctime.test a4effbe5472ef6c0308c4ebcba55c802aa297fff
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
- F test/cursorhint2.test fa41f0d997e67db921d08c31e73111b32811201a
+ F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
  F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
  F test/dbfuzz.c 8cc2bdb818b4483a052f9f80f96be74cbd9a6e1d
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
@@@ -679,8 -678,8 +682,8 @@@ F test/enc4.test c8f1ce3618508fd0909945
  F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
  F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 -F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
 +F test/exclusive.test ff85192dcf5000a1b53452a89fa9c5b61b0138cf
- F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
+ F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
  F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
@@@ -1038,10 -1036,10 +1041,10 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
- F test/rowvalue.test f4a60835c949ec4b8ddc15d78d8a9b412b805875
+ F test/rowvalue.test 44f3492f415cc9f374e8388a5eb61503eaca5230
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1165,7 -1163,7 +1168,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl face9fe494368cde6caa5f3017b238f1adf6d6c3
 -F test/tester.tcl 2a49c1aff731f380ea640106377e19611a1443ae
++F test/tester.tcl da51aaf82a0287aad07753dede0f428ed487bb41
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1548,7 -1547,7 +1552,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 dcbec226ca250fb9711edee41c2fafc883707808 a65a62893ca8319e89e48b8a38cf8a59c69a8209
- R 198c6da3035f8c0dc889b710a32dbfc2
 -P 58f02e6eae8fc9e2577fe435b0282fb46af3960d
 -R 4a4a07080dc840a599a4cd01566373f4
++P c59c8880238dffd7b8a6da789aa7112fef333bd6 d9752c8f7c55426fd7d2b877c5cc3784f93b5349
++R 971be8a3f21cff2b7f31043214b965c6
  U drh
- Z f8079d737159cf0fee731ec202cec4ea
 -Z 816a99767333ba2de388be8cc7b0ed87
++Z 64eb1fd6f8380515edffd6348d2b99c5

diff --cc manifest.uuid
index 5a77cebb47f0fdcb73bf38ea3893ab7bab726ac5,92d5c8ac0b4d24c6d32b2fdc0d38917478f760f2..d6f81e07f76061fc984e944931d8bf990169e5bf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c59c8880238dffd7b8a6da789aa7112fef333bd6
 -d9752c8f7c55426fd7d2b877c5cc3784f93b5349
++0e14fe1b986abf1449d727fbe04c6a939ed209a2

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
index 85d273f1ec8b84fc0d35c8974bb37530b8f15a63,23c31d4029d47ca8caadb29356d86ead27df966b..19ae235a6e14edeffdb7c5ca544dec09bf36eb55
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -664,6 -664,6 +664,22 @@@ void sqlite3VdbeVerifyNoResultRow(Vdbe 
  }
  #endif
  
++/*
++** Verify that the VM passed as the only argument does not contain
++** an OP_ResultRow opcode. Fail an assert() if it does. This is used
++** by code in pragma.c to ensure that the implementation of certain
++** pragmas comports with the flags specified in the mkpragmatab.tcl
++** script.
++*/
++#if defined(SQLITE_DEBUG) && !defined(SQLITE_TEST_REALLOC_STRESS)
++void sqlite3VdbeVerifyNoResultRow(Vdbe *p){
++  int i;
++  for(i=0; i<p->nOp; i++){
++    assert( p->aOp[i].opcode!=OP_ResultRow );
++  }
++}
++#endif
++
  /*
  ** This function returns a pointer to the array of opcodes associated with
  ** the Vdbe passed as the first argument. It is the callers responsibility

diff --cc test/tester.tcl
Simple merge