diff --git a/manifest b/manifest index caaf603930..7f4e9189fd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\sdiscarding\san\sORDER\sBY\sclause\sin\sthe\scase\swhere\san\sidentical\sGROUP\sBY\sclauses\suses\san\sindex\sto\sgroup,\sbut\snot\ssort,\sthe\srows.\sFix\sfor\s[b75a9ca6b0]. -D 2014-04-21T13:21:56.964 +C Comment\stweaks\son\sthe\stest\scase\sfor\sthe\s[b75a9ca6b0]\sbug\sfix. +D 2014-04-21T13:36:54.639 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -896,7 +896,7 @@ F test/tkt-a8a0d2996a.test eb597379dbcefa24765763d7f682c00cb5924fa9 F test/tkt-b1d3a2e531.test 8f7576e41ca179289ee1a8fee28386fd8e4b0550 F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0 F test/tkt-b72787b1.test a95e8cdad0b98af1853ac7f0afd4ab27b77bf5f3 -F test/tkt-b75a9ca6b0.test 3f4f7ca6ab552b6efdb664f821bc798a08929b2c +F test/tkt-b75a9ca6b0.test 97cc2d5eeaf82799eb42138c0a1ff64370238ce4 F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898 F test/tkt-bdc6bbbb38.test fc38bb09bdd440e3513a1f5f98fc60a075182d7d F test/tkt-c48d99d690.test ba61977d62ab612fc515b3c488a6fbd6464a2447 @@ -1161,7 +1161,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 9a5d38c79d2482a23bcfbc3ff35ca4fa269c768d -R ee944819c64836615905c8a0073df726 -U dan -Z 6ac990d90beb1121a87e97a89a4f2118 +P de9a490f594183f337a2ec9e0f87792eac83548b +R ce888b84132e0cad3bcca115a32951d3 +U drh +Z cf9f241149456ab1fa24984e95a412d2 diff --git a/manifest.uuid b/manifest.uuid index 6776a57944..a2761a597b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -de9a490f594183f337a2ec9e0f87792eac83548b \ No newline at end of file +65d2544af9adc1e2f1d193e57f8be0422fb0d5eb \ No newline at end of file diff --git a/test/tkt-b75a9ca6b0.test b/test/tkt-b75a9ca6b0.test index 38918bedaa..0c81a534da 100644 --- a/test/tkt-b75a9ca6b0.test +++ b/test/tkt-b75a9ca6b0.test @@ -1,4 +1,4 @@ -# 2014 April 21 +# 2014-04-21 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: @@ -11,6 +11,11 @@ # # Test that ticket [b75a9ca6b0] has been fixed. # +# Ticket [b75a9ca6b0] concerns queries that have both a GROUP BY +# and an ORDER BY. This code verifies that SQLite is able to +# optimize out the ORDER BY in some circumstances, but retains the +# ORDER BY when necessary. +# set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -70,6 +75,3 @@ foreach {tn q res eqp} [subst -nocommands { finish_test - - -