From: drh <drh@noemail.net>
Date: Fri, 3 Jun 2016 18:44:43 +0000 (+0000)
Subject: Add support for virtual tables using a WITHOUT ROWID schema.  This merge also
X-Git-Tag: version-3.14.0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4680a8b19e6f097c485babd4564e246fb21586f;p=thirdparty%2Fsqlite.git

Add support for virtual tables using a WITHOUT ROWID schema.  This merge also
includes enhancements to the CSV extension, which is used for testing of
the new WITHOUT ROWID virtual table mechanism.

FossilOrigin-Name: aa7e9d0cc15c050205b09d5a50f985e4ade571d0
---

a4680a8b19e6f097c485babd4564e246fb21586f
diff --cc manifest
index 8859f72be7,b320ac31b9..746eef98dc
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Enhance\sthe\ssqlite3_load_extension()\sinterface\sto\spermit\sextensions\sto\s\nreturn\sSQLITE_OK_LOAD_PERMANENTLY\swhich\swill\sprevents\sunloading\swhen\nthe\sdatabase\sconnection\scloses.
- D 2016-06-03T13:35:55.049
- F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 -C Fix\sa\smemory\sleak\swhen\sa\sWITHOUT\sROWID\seponymous\svirtual\stable\sis\sused.
 -D 2016-06-03T18:21:04.549
++C Add\ssupport\sfor\svirtual\stables\susing\sa\sWITHOUT\sROWID\sschema.\s\sThis\smerge\salso\nincludes\senhancements\sto\sthe\sCSV\sextension,\swhich\sis\sused\sfor\stesting\sof\nthe\snew\sWITHOUT\sROWID\svirtual\stable\smechanism.
++D 2016-06-03T18:44:43.987
+ F Makefile.in 7321ef0b584224781ec7731408857fa8962c32cc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
+ F Makefile.msc 831503fc4e988f571590af1405645fff121b5f1e
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -384,10 -383,10 +384,10 @@@ F src/resolve.c cca3aa77b95706df5d635a2
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c a0c4abf54bc6bd3a9c77a36ef3d1676045706cb2
  F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
 -F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
 +F src/sqlite.h.in 5f8113dbec74c6c093ead9930afb8c9fbd9f643d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h 09621b4b7dba808b24262c2480ea75b045001853
+ F src/sqliteInt.h 801e2a569ea79b09b87d045cd6f00ec88205f1f6
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1498,8 -1498,7 +1499,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 3bd85fa5a9a489fd505c973e37c33a76c1b0e957 d3f99a5e8d0486d0917dfe96987c179a6f63b850
- R ae39387c327ccfd8ae1b949a8c2348a2
- T +closed d3f99a5e8d0486d0917dfe96987c179a6f63b850
 -P d31c25972bfb6d04caad05534505698776e7e6d5
 -R 531a893078b3c566412693ad918cbea6
++P 5908aa4dc59925c414b236b6fd3d3ecd7f3da435 31b83a7d7e553163eb186fc966a885f237554ec2
++R d639ae9545f46893b71b6b259d95d5f5
++T +closed 31b83a7d7e553163eb186fc966a885f237554ec2
  U drh
- Z 5e388deebe72b8e4fdd13fe3fcf9419e
 -Z 4ddeb8f309e9f433c6376653796d4760
++Z 50d120c42dcf1821013820e0628daf1d
diff --cc manifest.uuid
index b974ab02f0,8dbe108de4..ee3c4ef63c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5908aa4dc59925c414b236b6fd3d3ecd7f3da435
 -31b83a7d7e553163eb186fc966a885f237554ec2
++aa7e9d0cc15c050205b09d5a50f985e4ade571d0