diff --git a/manifest b/manifest index fa2d5fd024..b3d0e5c5db 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Simplifications\sto\sthe\srange-scan\slogic\sin\ssupport\sof\sstructural\stesting. -D 2009-08-20T20:05:55 +C Remove\sa\sredundant\sOOM\stest\sfrom\sthe\ssqlite_stat2\sanalysis\sloader. +D 2009-08-20T23:05:32 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -103,7 +103,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad F src/alter.c 8b42cace4f8e312de596807ba2685179da64fec4 -F src/analyze.c e3ad83c1462c68cba458e3bdf21f00bc2069bf31 +F src/analyze.c 4584556d374fe3ab791be9be32ada7713fdced52 F src/attach.c 13995348fc5a26cdd136a50806faf292aabc173f F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3 @@ -750,14 +750,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 -P f0c24b5fb86940f1a88adfb39cc4b9cbfcc66f8a -R fba7b071d397254afdb7dd418afc24b1 +P bbbee81075d923be7ca11e6e635c069a05d1605a +R eab239da7209787ec5732b09de9f9669 U drh -Z a3493385ab2d90bfda4e2f3b5655326c +Z 01e877d7ee7064d548c5aab76302e92a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFKjaymoxKgR168RlERAktxAJ9hWJcPeuX/v/aYSdLb6euNeahO3QCdEDFq -iWZrIPg/Anzm5mxLXWy6Oqk= -=1mHW +iD8DBQFKjdbAoxKgR168RlERAvoTAJ4/zNxVT/sFvN+bAt9HmLCEGLDKFQCaAnsW +XXDCiaIyilF2mdCxXIokuSo= +=POqT -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 4a25a202ca..873363a1c3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bbbee81075d923be7ca11e6e635c069a05d1605a \ No newline at end of file +d30ceeb8b303e2ebfab2855beb973da606a97fa9 \ No newline at end of file diff --git a/src/analyze.c b/src/analyze.c index 8a59c55f60..273856d0af 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -606,7 +606,8 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ } } - if( pIdx->aSample ){ + assert( pIdx->aSample ); + { IndexSample *pSample = &pIdx->aSample[iSample]; pSample->eType = eType; if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){