mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor simplifications deferred to the next release.

Browse Source 
FossilOrigin-Name: a863729ccb75a56330460d3b7d558e639ad733d1
This commit is contained in:
drh 2016-02-11 13:30:36 +00:00
parent 8988aeef60
commit c41c132cf0
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifest
View File

@ -1,5 +1,5 @@
C In\sthe\sMSVC\smakefile,\sinclude\sthe\sworking\sdirectory\sso\sthat\sit\scan\spickup\sbuild\sgenerated\sfiles\s(e.g.\ssqlite3.h,\setc).
D 2016-02-10T21:45:25.033
C Minor\ssimplifications\sdeferred\sto\sthe\snext\srelease.
D 2016-02-11T13:30:36.283
F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 463edfba5c6fccebc61d8c094ccd463a6a55becb
@ -294,7 +294,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
F src/btree.c 4c8caaeed7878aafdb607c3d2bcbc365bb0d19a1
F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
F src/build.c 54866fbafa09d494269bdefc79995eb7207003a6
F src/build.c 7bc84362e4073841df1a24273e5bf87ddf46199f
F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@ -1427,7 +1427,10 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 970881befd5da6cc837c474d6e917de0bf029350
R 5eb3b947cad1b703762744d4a1125c44
U mistachkin
Z 4770d0013fc64e8d84870f88c904e1b8
P e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
R d9f96f88af7f04e58e3b08ec636650be
T *branch * simplify
T *sym-simplify *
T -sym-trunk *
U drh
Z 8d2d1255ad136ffbf4de853d8fcb27f6

2
manifest.uuid
View File

@ -1 +1 @@
e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
a863729ccb75a56330460d3b7d558e639ad733d1

8
src/build.c
View File

@ -710,12 +710,8 @@ int sqlite3FindDbName(sqlite3 *db, const char *zName){
int i = -1; /* Database number */
if( zName ){
Db *pDb;
int n = sqlite3Strlen30(zName);
for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
if( (!OMIT_TEMPDB || i!=1 ) && n==sqlite3Strlen30(pDb->zName) &&
0==sqlite3StrICmp(pDb->zName, zName) ){
break;
}
if( 0==sqlite3StrICmp(pDb->zName, zName) ) break;
}
}
return i;
@ -3237,7 +3233,7 @@ Index *sqlite3CreateIndex(
if( pIdx->aiColumn[k]!=pIndex->aiColumn[k] ) break;
z1 = pIdx->azColl[k];
z2 = pIndex->azColl[k];
if( z1!=z2 && sqlite3StrICmp(z1, z2) ) break;
if( sqlite3StrICmp(z1, z2) ) break;
}
if( k==pIdx->nKeyCol ){
if( pIdx->onError!=pIndex->onError ){