Index: ext/repair/checkindex.c
==================================================================
--- ext/repair/checkindex.c
+++ ext/repair/checkindex.c
@@ -296,11 +296,12 @@
   pGroup = cidxPrepare(&rc, pCsr,
       "SELECT group_concat("
       "  coalesce('quote(' || name || ')', 'rowid'), '|| '','' ||'"
       ") AS zCurrentKey,"
       "       group_concat("
-      "  coalesce(name, 'rowid') || CASE WHEN desc THEN ' DESC' ELSE '' END,"
+      "  coalesce(name, 'rowid') || ' COLLATE ' || coll "
+      "  || CASE WHEN desc THEN ' DESC' ELSE '' END,"
       "  ', '"
       ") AS zOrderBy,"
       "       group_concat("
       "         CASE WHEN key==1 THEN NULL ELSE "
       "  coalesce(name, 'rowid') || ' IS \"%w\".' || coalesce(name, 'rowid') "
@@ -311,11 +312,11 @@
       "         CASE WHEN key==0 THEN NULL ELSE "
       "  coalesce(name, 'rowid') || ' IS \"%w\".' || coalesce(name, 'rowid') "
       "         END,"
       "  ' AND '"
       ") AS zSubExpr,"
-      "       count(*) AS nCol"
+      "      count(*) AS nCol"
       " FROM pragma_index_xinfo(%Q);"
       , zIdx, zIdx, zIdx
   );
   if( rc==SQLITE_OK && sqlite3_step(pGroup)==SQLITE_ROW ){
     zCurrentKey = cidxStrdup(&rc, (const char*)sqlite3_column_text(pGroup, 0));

Index: test/checkindex.test
==================================================================
--- test/checkindex.test
+++ test/checkindex.test
@@ -183,10 +183,11 @@
   {} 2,2,2,8 
   {} 3,2,2,6 
   {} 3,2,2,9
 }
 
+#--------------------------------------------------------------------------
 do_execsql_test 3.0 {
 
   CREATE TABLE t3(w, x, y, z PRIMARY KEY) WITHOUT ROWID;
   CREATE INDEX t3wxy ON t3(w, x, y);
   CREATE INDEX t3wxy2 ON t3(w DESC, x DESC, y DESC);
@@ -213,8 +214,51 @@
 do_index_check_test 3.2 t3wxy2 {
   {} 'a','b',NULL,7   {} 'a','b',NULL,8   {} 'a','b',NULL,9 
   {} 'a',NULL,NULL,4  {} 'a',NULL,NULL,5  {} 'a',NULL,NULL,6 
   {} NULL,NULL,NULL,1 {} NULL,NULL,NULL,2 {} NULL,NULL,NULL,3 
 }
+
+#--------------------------------------------------------------------------
+# Test with an index that uses non-default collation sequences.
+#
+do_execsql_test 4.0 {
+  CREATE TABLE t4(a INTEGER PRIMARY KEY, c1 TEXT, c2 TEXT);
+  INSERT INTO t4 VALUES(1, 'aaa', 'bbb');
+  INSERT INTO t4 VALUES(2, 'AAA', 'CCC');
+  INSERT INTO t4 VALUES(3, 'aab', 'ddd');
+  INSERT INTO t4 VALUES(4, 'AAB', 'EEE');
+
+  CREATE INDEX t4cc ON t4(c1 COLLATE nocase, c2 COLLATE nocase);
+}
+
+do_index_check_test 4.1 t4cc {
+  {} 'aaa','bbb',1 
+  {} 'AAA','CCC',2 
+  {} 'aab','ddd',3 
+  {} 'AAB','EEE',4
+}
+
+do_test 4.2 {
+  set tblroot [db one { SELECT rootpage FROM sqlite_master WHERE name='t4' }]
+  sqlite3_test_control SQLITE_TESTCTRL_IMPOSTER db main 1 $tblroot
+  db eval {CREATE TABLE xt4(a INTEGER PRIMARY KEY, c1 TEXT, c2 TEXT)}
+  sqlite3_test_control SQLITE_TESTCTRL_IMPOSTER db main 0 0
+
+  execsql {
+    UPDATE xt4 SET c1='hello' WHERE rowid=2;
+    DELETE FROM xt4 WHERE rowid = 3;
+  }
+
+  sqlite3_test_control SQLITE_TESTCTRL_IMPOSTER db main 0 1
+} {}
+
+do_index_check_test 4.3 t4cc {
+  {} 'aaa','bbb',1 
+  {row data mismatch} 'AAA','CCC',2 
+  {row missing} 'aab','ddd',3 
+  {} 'AAB','EEE',4
+}
+
+
 
 finish_test