Merge the fix for the CREATE UNIQUE INDEX problem into the sessions branch.

FossilOrigin-Name: 43401ee624587ffa166c3cda7e5265ad0d81da5c

diff --cc manifest
index b9a388624229fca813eada62bee568f064c31ffb,551a1332b7040f3dd7ecb263823a4a5717639693..7b0a5c109462eeea44d7ab895e82eabbcf9ee0ad
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\schanges,\sand\sespecially\sthe\sfix\sfor\sthe\sR-Tree\sproblem\ndescribed\sin\sticket\s[d2889096e7bdeac6].
- D 2014-07-29T12:40:45.487
 -C Ensure\sthat\sthe\scorrect\snumber\sof\scolumns\sin\sa\sUNIQUE\sindex\sare\schecked\sfor\nuniqueness,\sregardless\sof\swhether\sor\snot\sthe\soriginal\stable\shas\sa\sROWID\sor\nif\sthe\scolumns\sare\sNOT\sNULL,\setc.\s\sTicket\s[9a6daf340df99ba93c].
 -D 2014-07-30T13:56:48.415
++C Merge\sthe\sfix\sfor\sthe\sCREATE\sUNIQUE\sINDEX\sproblem\sinto\sthe\ssessions\sbranch.
++D 2014-07-30T14:29:54.721
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -203,7 -189,7 +203,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 20aa3e3d5ef5727dff8efbfc3a9420460e201e05
 -F src/main.c bbf7f993843fc3fc496089747f6849272d77e824
++F src/main.c bc02756952d81d9ef8c7ce544ebc9f794c498f5e
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -238,10 -224,10 +238,10 @@@ F src/resolve.c 5fc110baeacf120a73fe34e
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
  F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in a7cfafa4874726efb9ae51a88770a9de8b21a42c
 -F src/sqlite.h.in 5967719136e14183b2573ba619993438e2b9856e
++F src/sqlite.h.in c5940e8fdc6b2b046bb00a07edb1cc3fa342bd5d
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
 +F src/sqliteInt.h 56c7fe562722601d83a53bd8b5262a975851bf95
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -297,14 -283,14 +297,14 @@@ F src/update.c 0f16e1d55d642a7ae3199bd0
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 3d1953149725e74ac76e8c3556f455513f6e3e57
 -F src/vdbe.c f87f77b0049cbef1fa68b331c3551d82b4d9fba4
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 79cd84435224f9f4edd420467f3a7bad29fffa8f
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
 +F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
 +F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
 +F src/vdbeaux.c c034933f1d417e333d07b63e5a4623cbaeccb361
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
- F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
+ F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -1199,7 -1185,7 +1200,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a9db017eabdefafcda87c497e8bafa07002ac0fe 8cc41b0bf365af47c2061ffe44c86018945dd239
- R 397e9c937f93489d3db975d7840d7883
 -P ca9868cdae19045dc522490b34dee0f14d928ebe
 -R aa3d0aadabff4023861d0c947293977e
++P 8f1beeade0ddf802900c9d203a4fd678d1190394 6b785e92f279cb65746834d5cd25594fd3333342
++R 4306541d4063ef0a1799e70c4c3d4ff7
  U drh
- Z 2a6be15adfeaf45265e0181bd2c8489c
 -Z 0e144877cde1d96e38c3dc4f9894f6d4
++Z 69e112d4dad31a7cb28801f346a66d8a

diff --cc manifest.uuid
index 9725c5f1b7788313cebc60977e3fb9b6aaa91777,194b99221e4a89d359d8e3cbfd372bc6793246ef..a81b86c76ca0da8eaf35d27753692b151f050da4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8f1beeade0ddf802900c9d203a4fd678d1190394
 -6b785e92f279cb65746834d5cd25594fd3333342
++43401ee624587ffa166c3cda7e5265ad0d81da5c

diff --cc src/main.c
Simple merge

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

diff --cc src/vdbe.c
Simple merge