diff --git a/manifest b/manifest
index 315bfc07e2..a464c4071d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sINDEXED\sBY\sand\sNOT\sINDEXED\sclauses\sin\sSELECT\sstatements.\s(CVS\s5766)
-D 2008-10-06T05:32:19
+C Add\sa\stest\sto\sindexedby.test\sto\scheck\sthat\sautomatic\sindexes\s(sqlite_autoindex_xxx)\scan\sbe\sused\swith\sthe\sINDEXED\sBY\ssyntax.\s(CVS\s5767)
+D 2008-10-06T11:29:49
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -372,7 +372,7 @@ F test/incrvacuum_ioerr.test 57d2f5777ab13fa03b87b262a4ea1bad5cfc0291
 F test/index.test cbf301cdb2da43e4eac636c3400c2439af1834ad
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 727d55dceb9a4ec36675057bb5becfc265e28ca6
-F test/indexedby.test b3fde1aed0790ad5e6366e0cf48f9cc34a3c7745
+F test/indexedby.test 5e54a6b25ac619502a4960c1bf7ca93bb23da5df
 F test/insert.test aef273dd1cee84cc92407469e6bd1b3cdcb76908
 F test/insert2.test 4f3a04d168c728ed5ec2c88842e772606c7ce435
 F test/insert3.test 9a4ef3526fd3cca8b05278020ec3100448b4c677
@@ -639,7 +639,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 1a91f3fd58608e258b60305d1d18c3d07d2e9c46
-R 8c1c7a684aaa38c556e33506eaf2c8a3
+P 98ca5580f5acd2e7b3ce512520ec0527f221505e
+R 0f893f469ad12cc6a25579e35395d754
 U danielk1977
-Z 40b4cbdd0428ffc473ce2e8ffc9b642c
+Z ca84df9ff1faefde10026b9c258b030a
diff --git a/manifest.uuid b/manifest.uuid
index d54542d380..2e06e15039 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-98ca5580f5acd2e7b3ce512520ec0527f221505e
\ No newline at end of file
+bb51c34506b3353506b6f3566fbe2a10d02e8ebc
\ No newline at end of file
diff --git a/test/indexedby.test b/test/indexedby.test
index bb9a9bc0bf..6696462f68 100644
--- a/test/indexedby.test
+++ b/test/indexedby.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: indexedby.test,v 1.1 2008/10/06 05:32:19 danielk1977 Exp $
+# $Id: indexedby.test,v 1.2 2008/10/06 11:29:49 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -26,6 +26,8 @@ do_test indexedby-1.1 {
     CREATE INDEX i3 ON t2(c);
     CREATE INDEX i4 ON t2(d);
 
+    CREATE TABLE t3(e PRIMARY KEY, f);
+
     CREATE VIEW v1 AS SELECT * FROM t1;
   }
 } {}
@@ -100,6 +102,19 @@ do_test indexedby-3.7 {
   catchsql { SELECT * FROM t1 INDEXED BY i1 ORDER BY a }
 } {0 {}}
 
+do_test indexedby-3.8 {
+  EQP { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 ORDER BY e }
+} {0 0 {TABLE t3 WITH INDEX sqlite_autoindex_t3_1 ORDER BY}}
+do_test indexedby-3.9 {
+  EQP { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE e = 10 }
+} {0 0 {TABLE t3 WITH INDEX sqlite_autoindex_t3_1}}
+do_test indexedby-3.10 {
+  catchsql { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE f = 10 }
+} {1 {cannot use index: sqlite_autoindex_t3_1}}
+do_test indexedby-3.11 {
+  catchsql { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_2 WHERE f = 10 }
+} {1 {no such index: sqlite_autoindex_t3_2}}
+
 # Tests for multiple table cases.
 #
 do_test indexedby-4.1 {