diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
| commit | 67ddb6507d58b08f88dfede96b057eae34d9d76e (patch) | |
| tree | 5f28ca11d7940d4fc17b6b9182eda27bae88e70f /storage/mroonga | |
| parent | 6073049a3675363f7d7efe26f47525b528be9e2f (diff) | |
| parent | c221bcdce7714a74b89a02de941e8d8df2994ce3 (diff) | |
| download | mariadb-git-67ddb6507d58b08f88dfede96b057eae34d9d76e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/ts.c | 2 | ||||
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/ts.c b/storage/mroonga/vendor/groonga/lib/ts.c index 68e363a27d7..909f4864786 100644 --- a/storage/mroonga/vendor/groonga/lib/ts.c +++ b/storage/mroonga/vendor/groonga/lib/ts.c @@ -683,7 +683,7 @@ static grn_rc grn_ts_select_output(grn_ctx *ctx, grn_obj *table, grn_ts_str str, const grn_ts_record *in, size_t n_in, size_t n_hits) { - grn_ts_writer *writer; + grn_ts_writer *writer= 0; grn_rc rc = grn_ts_writer_open(ctx, table, str, &writer); if (rc != GRN_SUCCESS) { return rc; diff --git a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c index ddd69714b1e..4ae900034bb 100644 --- a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c +++ b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c @@ -5173,7 +5173,7 @@ grn_ts_expr_node_deref(grn_ctx *ctx, grn_ts_expr_node **node_ptr) { grn_ts_expr_node *node = *node_ptr, **in_ptr = NULL; while ((node->data_kind & ~GRN_TS_VECTOR_FLAG) == GRN_TS_REF) { - grn_ts_expr_node *new_node; + grn_ts_expr_node *new_node= 0; grn_rc rc = grn_ts_expr_node_deref_once(ctx, node, &new_node); if (rc != GRN_SUCCESS) { if (in_ptr) { |