diff --git a/manifest b/manifest index c9d25efc91..af9d22779a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\ssome\scommented-out\scode\sfrom\ssqlite3BtreeMovetoUnpacked()\sto\stry\sto\smake\nit\smore\sreadable. -D 2013-12-06T22:44:51.968 +C Use\smemcmp()\sinstead\sof\sthe\sBINARY\scollating\sfunction\swhere\spossible,\sfor\na\sperformance\sboost. +D 2013-12-06T22:45:31.452 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -169,7 +169,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btree.c 1c1228bfeff3142c3d30f37f41c62e1e1456a04b F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0 -F src/build.c 1965c7b596ca6295b7ca59541ad186c57564b8f7 +F src/build.c 9b40580b62916612678bdb69ce0286e39c29a862 F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd @@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 27392118af4c38c5203a04b8013e1afdb1cebd0d -R 37ccd3e8b8d51b4fffcef9ee439c7da2 +P 2d62d1131f8bbc4e1f8f7aeaf0d91e3237fe3b7c +R 64ecaeb699cffb8c7d50ef92ad2b85dd U drh -Z b12a0af0516653b272442a79b4596fc8 +Z 924fa8368d7b3d9057325dee3400f3cb diff --git a/manifest.uuid b/manifest.uuid index 3816e1f6cf..cff17acb92 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2d62d1131f8bbc4e1f8f7aeaf0d91e3237fe3b7c \ No newline at end of file +c5a3a1af3c7bd34886e944a1fef2f6340ded24a0 \ No newline at end of file diff --git a/src/build.c b/src/build.c index fd512358bc..a7d5a29946 100644 --- a/src/build.c +++ b/src/build.c @@ -4183,8 +4183,9 @@ KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){ assert( sqlite3KeyInfoIsWriteable(pKey) ); for(i=0; iazColl[i]; - if( NEVER(zColl==0) ) zColl = "BINARY"; - pKey->aColl[i] = sqlite3LocateCollSeq(pParse, zColl); + assert( zColl!=0 ); + pKey->aColl[i] = strcmp(zColl,"BINARY")==0 ? 0 : + sqlite3LocateCollSeq(pParse, zColl); pKey->aSortOrder[i] = pIdx->aSortOrder[i]; } if( pParse->nErr ){