Merge in the CREATE UNIQUE INDEX fix of ticket [9a6daf340df99ba93c53bcf].

FossilOrigin-Name: fa7912320fd92c957034164f51d993f86220cf36

diff --cc manifest
index ffdd68282c29aaef083bbcd846bb3ca0ac975ead,551a1332b7040f3dd7ecb263823a4a5717639693..b52fc257c4a016d63ceaf45a7a1ccf71383b46f2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\sR-Tree\sIN\soperator\sfix\nof\sticket\s[d2889096e7bdeac].
- D 2014-07-30T11:49:32.182
 -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\sin\sthe\sCREATE\sUNIQUE\sINDEX\sfix\sof\sticket\s[9a6daf340df99ba93c53bcf].
++D 2014-07-30T14:57:00.800
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -170,10 -167,10 +170,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c b5531339cd826af46b9621e4a9323971a9380e12
 +F src/btree.c ab2fad23fdbcdc3cdc6e687a9c62535e91eec263
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b
+ F src/build.c 7ba21d8f0f5f1e8b5a0ed21aab9be2b39d1af516
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -287,18 -283,18 +287,18 @@@ F src/update.c 01564b3c430f6c7b0a35afaf
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c d05d3d0e46fcc07e912448bba0382e827d0a7051
 -F src/vdbe.c f87f77b0049cbef1fa68b331c3551d82b4d9fba4
++F src/vdbe.c 4faacd47f8dae8c950367f25e50da70efa103a34
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
  F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 +F src/vdbeapi.c 4606079c86aa9732b89b0ab6e16b6b776474a1cd
 +F src/vdbeaux.c 34dcb2a012cc4acc7b59f3afa9606c6bb0e42538
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  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
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 785b8a1fdd5600f2265b57691708329cae9acbad
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
  F src/where.c 4dfcd80380d154be434c4b51e890e17ce9754b3e
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
@@@ -1189,7 -1185,7 +1190,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 3810dc62d2739cfd4f0dae7cea6af481cc698a0b ca9868cdae19045dc522490b34dee0f14d928ebe
- R ee0531b72a62e2874582373e75529b74
 -P ca9868cdae19045dc522490b34dee0f14d928ebe
 -R aa3d0aadabff4023861d0c947293977e
++P 654c6c658ba7557eb822b03264bb4d259c216c01 6b785e92f279cb65746834d5cd25594fd3333342
++R f27fc3bea7e487d84cab0fef0b2933cc
  U drh
- Z 2e67c811b87a5e8d626957bedf621442
 -Z 0e144877cde1d96e38c3dc4f9894f6d4
++Z 74b9dc6bc0a8d88a6e962a4d326b8088

diff --cc manifest.uuid
index 64b303e3183acdfc72b39f1b428d5d6431cc08dd,194b99221e4a89d359d8e3cbfd372bc6793246ef..db69463ff05a47c458f7ea15081cea7f919cae67
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 654c6c658ba7557eb822b03264bb4d259c216c01
 -6b785e92f279cb65746834d5cd25594fd3333342
++fa7912320fd92c957034164f51d993f86220cf36

diff --cc src/vdbe.c
Simple merge