fixed grn_table_cursor_open parameters.

mroonga · Mar 16, 2010 · b3e5655 · b3e5655
1 parent 602c121
commit b3e5655
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/driver.c b/driver.c
@@ -657,19 +657,19 @@ int mrn_rnd_init(grn_ctx *ctx, mrn_info *info, mrn_expr *expr)
       }
       cur = cur->next;
     }
-
+    grn_expr_compile(ctx, gexpr);
     info->res = grn_table_create(ctx, NULL, 0, NULL,
                                  GRN_TABLE_HASH_KEY|GRN_OBJ_WITH_SUBREC,
                                  info->table->obj, NULL);
     grn_table_select(ctx, info->table->obj, gexpr, info->res, GRN_OP_OR);
     info->cursor = grn_table_cursor_open(ctx, info->res, NULL, 0, NULL,
-                                         0, 0, 0, 0);
+                                         0, 0, -1, 0);
     grn_obj_close(ctx, &intbuf);
     grn_obj_close(ctx, &textbuf);
   }
   else
   {
-    info->cursor = grn_table_cursor_open(ctx, info->table->obj, NULL, 0, NULL, 0, 0, 0, 0);
+    info->cursor = grn_table_cursor_open(ctx, info->table->obj, NULL, 0, NULL, 0, 0, -1, 0);
     if (info->cursor == NULL)
     {
       GRN_LOG(ctx, GRN_LOG_ERROR, "cannot open cursor: %s", info->table->name);

diff --git a/test/run-unit-test.sh b/test/run-unit-test.sh
@@ -12,7 +12,7 @@ if test -z "$CUTTER"; then
 fi
 export CUTTER
 
-CUTTER_ARGS="-v v --fatal-failures"
+CUTTER_ARGS=
 CUTTER_WRAPPER=
 if test x"$CUTTER_DEBUG" = x"yes"; then
     if test x"$TUI_DEBUG" = x"yes"; then
@@ -27,5 +27,11 @@ elif test x"$CUTTER_CHECK_LEAK" = x"yes"; then
     CUTTER_ARGS="--keep-opening-modules"
 fi
 
+if test x"$STOP_ERROR" = x"yes"; then
+    CUTTER_ARGS="-v v --fatal-failures"
+else
+    CUTTER_ARGS="-v v"
+fi
+
 CUTTER_ARGS="$CUTTER_ARGS -s $BASE_DIR"
 $CUTTER_WRAPPER $CUTTER $CUTTER_ARGS "$@" $BASE_DIR