Skip to content
/ server Public

MDEV-37952: Fix crash when setting mroonga_default_tokenizer to NULL #4606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vuvova merged 4 commits into from
Feb 12, 2026
Merged

MDEV-37952: Fix crash when setting mroonga_default_tokenizer to NULL #4606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7244a4d
MDEV-37952: Fix crash when setting mroonga_default_tokenizer to NULL
hadeer-r Feb 1, 2026
003fc4f
mroonga: handle allocation for new_value in mrn_default_tokenizer_update
hadeer-r Feb 7, 2026
0c5fa16
Mroonga: Refactor variable_default_tokenizer_disable test
hadeer-r Feb 9, 2026
ab4e5b2
Merge branch '10.6' into MDEV-37952
gkodinov Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions storage/mroonga/ha_mroonga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,12 @@ static void mrn_default_tokenizer_update(THD *thd, struct st_mysql_sys_var *var,
char **old_value_ptr = (char **)var_ptr;
grn_ctx *ctx = &mrn_ctx;

if(!new_value) {
new_value = "off";
#ifndef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR
new_value = mrn_my_strdup(new_value, MYF(MY_WME));
#endif
}
mrn_change_encoding(ctx, system_charset_info);
if (strcmp(*old_value_ptr, new_value) == 0) {
GRN_LOG(ctx, GRN_LOG_NOTICE,
Expand Down
5 changes: 5 additions & 0 deletions storage/mroonga/mysql-test/mroonga/storage/r/variable_default_tokenizer_disable.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SET GLOBAL mroonga_default_tokenizer = NULL;
SHOW GLOBAL VARIABLES LIKE 'mroonga_default_tokenizer';
Variable_name Value
mroonga_default_tokenizer off
SET GLOBAL mroonga_default_tokenizer = DEFAULT;
25 changes: 25 additions & 0 deletions storage/mroonga/mysql-test/mroonga/storage/t/variable_default_tokenizer_disable.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- mode: sql; sql-product: mysql -*-
#
# Copyright (C) 2026 hadeer <hadderramadan7@gmail.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--source include/not_embedded.inc
--source ../../include/mroonga/have_mroonga.inc

SET GLOBAL mroonga_default_tokenizer = NULL;
SHOW GLOBAL VARIABLES LIKE 'mroonga_default_tokenizer';
SET GLOBAL mroonga_default_tokenizer = DEFAULT;

--source ../../include/mroonga/have_mroonga_deinit.inc