mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.2 to 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2019-08-13 19:28:51 +03:00
commit 65d48b4a7b
81 changed files with 1700 additions and 984 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/vendor/groonga/lib/ts.c vendored
View file

@ -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;

2
storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c vendored
View file

@ -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) {