Queries with multiple IN(...) conditions sometimes return the wrong results when…

Queries with multiple IN(...) conditions sometimes return the wrong results when there was a multi-column index for the column.

h2/src/main/org/h2/index/IndexCursor.java

@@ -142,7 +142,7 @@ public class IndexCursor implements Cursor {
         // or it must be a VIEW index (where the column is null).
         // Multiple IN conditions with views are not supported, see
         // IndexCondition.getMask.
-        IndexColumn idxCol = indexColumns[0];
+        IndexColumn idxCol = index.getIndexColumns()[0];
         return idxCol == null || idxCol.column == column;
     }
 
@@ -203,13 +203,17 @@ public class IndexCursor implements Cursor {
 
     private void nextCursor() {
         if (inList != null) {
-            if (inListIndex < inList.length) {
+            while (inListIndex < inList.length) {
                 Value v = inList[inListIndex++];
+                if (v != ValueNull.INSTANCE) {
                     find(v);
+                    break;
+                }
             }
         } else if (inResult != null) {
             while (inResult.next()) {
                 Value v = inResult.currentRow()[0];
+                if (v != ValueNull.INSTANCE) {
                     v = inColumn.convert(v);
                     if (inResultTested.add(v)) {
                         find(v);
@@ -218,6 +222,7 @@ public class IndexCursor implements Cursor {
                 }
             }
         }
+    }
 
     private void find(Value v) {
         v = inColumn.convert(v);