From: dan <dan@noemail.net>
Date: Mon, 28 Mar 2016 15:06:50 +0000 (+0000)
Subject: Integrate the vcreate-stmt branch into this one.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b69bf94be68d5fcdb05b9106cd76f2fc5525dd2a;p=thirdparty%2Fsqlite.git

Integrate the vcreate-stmt branch into this one.

FossilOrigin-Name: 06039d901ad680b8d5abdf31c3799bd971750b5d
---

b69bf94be68d5fcdb05b9106cd76f2fc5525dd2a
diff --cc manifest
index 5533f5693d,7a49cd4b70..07168fc874
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\sOOM\shandling\swhen\ssetting\san\sfts5\sconfiguration\soption.
- D 2016-03-26T20:11:04.128
 -C Open\sa\sstatement\stransaction\sfor\s"CREATE\sVIRTUAL\sTABLE"\sstatements\sin\sorder\sto\sensure\sthat\sif\sthe\sxCreate()\scall\sfails,\schanges\smade\sto\sthe\ssqlite_master\sand\spossibly\sother\stables\sare\srolled\sback.
 -D 2016-03-28T14:57:04.013
++C Integrate\sthe\svcreate-stmt\sbranch\sinto\sthis\sone.
++D 2016-03-28T15:06:50.597
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -181,9 -180,9 +181,9 @@@ F ext/fts5/test/fts5rank.test 7e9e64eac
  F ext/fts5/test/fts5rebuild.test 03935f617ace91ed23a6099c7c74d905227ff29b
  F ext/fts5/test/fts5restart.test c17728fdea26e7d0f617d22ad5b4b2862b994c17
  F ext/fts5/test/fts5rowid.test 16908a99d6efc9ba21081b4f2b86b3fc699839a6
 -F ext/fts5/test/fts5simple.test cd23d4072ea095d652c9b6db12284cc642e49c98
 +F ext/fts5/test/fts5simple.test f157c8b068f5e68473ad86bfe220b07a84e0209f
  F ext/fts5/test/fts5simple2.test 98377ae1ff7749a42c21fe1a139c1ed312522c46
- F ext/fts5/test/fts5simple3.test 8e71733b3d1b0e695011d02c68ebc5ca40b6124e
+ F ext/fts5/test/fts5simple3.test 5e00bc009aa0a62190e795383d969b8f31dbde15
  F ext/fts5/test/fts5synonym.test 6475d189c2e20d60795808f83e36bf9318708d48
  F ext/fts5/test/fts5synonym2.test aa4c43bd3b691ff80f658cb064f5ab40690e834e
  F ext/fts5/test/fts5tok1.test beb894c6f3468f10a574302f69ebe4436b0287c7
@@@ -1460,10 -1459,10 +1460,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 8213c2f58167243411d29cc58e303b4be656f756
- R be57f13787d59ee7ecd47b81dbe52717
- T *branch * fts5
- T *sym-fts5 *
 -P f6a88cccbc0c62a0b453f4711298c9d5e1882b18
 -R dadeb3bb7a060e0da4677a7f51fa7277
 -T *branch * vcreate-stmt
 -T *sym-vcreate-stmt *
--T -sym-trunk *
++P 53b80a6d054a1c87311b3dc1c2bcfcc1b676b05a d0a3853b37230c12f8d4c5c24401cb707991e5e4
++R ffe18224996cd879ed36bca59636011d
++T +closed d0a3853b37230c12f8d4c5c24401cb707991e5e4
  U dan
- Z 9cae65c93dd0ffab0ada61227cd993a5
 -Z e4289e8a630a23c8c71af0317c2bb78e
++Z a57793b5d3a81d4bcf7041fac7b6fde4
diff --cc manifest.uuid
index 8024331f68,aa92ca4e7b..2a881f3d9c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 53b80a6d054a1c87311b3dc1c2bcfcc1b676b05a
 -d0a3853b37230c12f8d4c5c24401cb707991e5e4
++06039d901ad680b8d5abdf31c3799bd971750b5d