When checking indices for xfer compatibility, compare collating sequences

by string, not by pointer. (CVS 6590)

FossilOrigin-Name: 7d2b80c7addc2d03d49647da9c6df9113f01349d

diff --git a/manifest b/manifest
index d9b13d0cc28309c9f65ff2b06d9ea683fceb5277..ece946672d3afecc03596c5c111b468b7446bfaf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Record\swithin\sthe\sToken\sstructure\sitself\swhether\sor\snot\sthe\stoken\shas\nbeen\sdequoted.\s\sThis\ssteals\sone\sbit\sfrom\sthe\slength\sof\sa\stoken\sand\nthus\slimits\sthe\ssize\sof\stokens\sto\s1GiB.\s(CVS\s6589)
-D 2009-05-01T21:13:37
+C When\schecking\sindices\sfor\sxfer\scompatibility,\scompare\scollating\ssequences\nby\sstring,\snot\sby\spointer.\s(CVS\s6590)
+D 2009-05-02T00:28:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -121,7 +121,7 @@ F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
 F src/hash.c 0caea57f020226903cd8591125732e1e19f17f14
 F src/hash.h 457e230c3b2bd3c56742824d43b16618ff30d7c0
 F src/hwtime.h 4a1d45f4cae1f402ea19686acf24acf4f0cb53cb
-F src/insert.c bd12b428bf5d2ec9addb6fcac80ac64ed5b5830e
+F src/insert.c 0805018acaa97c5f5b83d4e058da821bc12fa0c6
 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 2ad5b52df322d0f132f66817095e0e79c8942611
 F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc
@@ -727,7 +727,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 795b453c9a03c32d9d4cdf62823d2b9dd667cc44
-R 994fb061d5b0d2325e7c5c8dbfd393af
+P 12bcb03d9b9e1a31c1a3c67cbb4263cc0af2f3d0
+R 8edf51cebaa75e1ff454593543001664
 U drh
-Z d49f301efd3673d168abb1e51c03747b
+Z 2f79b9c87cb7ff06d995b9e724df5941

diff --git a/manifest.uuid b/manifest.uuid
index 7c668550c5cb248666a91143cfcd806a7a85c7f1..147ad5ad6499f730c8f529db3fb1abeac4aaff38 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-12bcb03d9b9e1a31c1a3c67cbb4263cc0af2f3d0
\ No newline at end of file
+7d2b80c7addc2d03d49647da9c6df9113f01349d
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index f86f0e5f4fb0174b8cbf6363cebd1a1aca6788a0..5939d1e22fde55e13b89b2e7d8ee63aca566b709 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.263 2009/05/01 15:17:48 drh Exp $
+** $Id: insert.c,v 1.264 2009/05/02 00:28:20 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1489,7 +1489,7 @@ static int xferCompatibleIndex(Index *pDest, Index *pSrc){
     if( pSrc->aSortOrder[i]!=pDest->aSortOrder[i] ){
       return 0;   /* Different sort orders */
     }
-    if( pSrc->azColl[i]!=pDest->azColl[i] ){
+    if( !xferCompatibleCollation(pSrc->azColl[i],pDest->azColl[i]) ){
       return 0;   /* Different collating sequences */
     }
   }