diff --git a/manifest b/manifest index 0f731b2855..3c9566e325 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\sdeterministic\sdate/time\sfunction\slogic\sthat\scan\sonly\sappear\nwith\sSTAT3\sor\sSTAT4. -D 2017-07-25T01:34:05.482 +C Fix\sa\scomment\son\sthe\sUnpackedRecord.r1\sand\sUnpackedRecord.r2\sfields.\nNo\schanges\sto\scode. +D 2017-07-26T10:04:51.472 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016 @@ -458,7 +458,7 @@ F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c17 F src/sqlite.h.in 6832630003ce858f55c750181488f30aa167870110d843035e501729a6a1c4cf F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b -F src/sqliteInt.h bd6be75bc43d38ada272ef0b3472bc44ef0cc15536bea22c349ca1a2812a19ce +F src/sqliteInt.h 3bbfdcff01270f6db3700cb6303563b9bc429df4d0800af374002bae7312bf76 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -1637,7 +1637,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 1a632a9a6c85b78abe0351ef91c7478b26299c4c1c269d5796afb1e172084517 -R 8215cf089e6d9a2d7dcbd4ee22b67db3 +P 1ca707a4fb8db7aa85430413164265607ce727fc8a5afc3424b3abfb59921b39 +R ef45dd313669ead46fc91ee2c542a47e U drh -Z f46d8d102bf3b4a07103f8534020f352 +Z 87bff43b0188a51b1508e2de7ded1aaf diff --git a/manifest.uuid b/manifest.uuid index 9eb734f9c8..25c4dabe35 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1ca707a4fb8db7aa85430413164265607ce727fc8a5afc3424b3abfb59921b39 \ No newline at end of file +622b108915c7982b29ca9920abde941fff55234b70af9ac4122e4827b35d985c \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 20e2af3938..2d19849dad 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2089,8 +2089,8 @@ struct UnpackedRecord { u16 nField; /* Number of entries in apMem[] */ i8 default_rc; /* Comparison result if keys are equal */ u8 errCode; /* Error detected by xRecordCompare (CORRUPT or NOMEM) */ - i8 r1; /* Value to return if (lhs > rhs) */ - i8 r2; /* Value to return if (rhs < lhs) */ + i8 r1; /* Value to return if (lhs < rhs) */ + i8 r2; /* Value to return if (lhs > rhs) */ u8 eqSeen; /* True if an equality comparison has been seen */ };