mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-10-03 10:55:08 +03:00
commit 63913ce5af
519 changed files with 5112 additions and 995 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/mroonga/CMakeLists.txt
View file

@ -421,14 +421,6 @@ set(MRN_TEST_SUITE_DIR "${CMAKE_SOURCE_DIR}/mysql-test/suite/mroonga")
if(NOT EXISTS "${MRN_TEST_SUITE_DIR}")
set(MRN_TEST_SUITE_DIR "${PROJECT_SOURCE_DIR}/mysql-test/mroonga")
endif()
configure_file(
"${MRN_TEST_SUITE_DIR}/storage/r/information_schema_plugins.result.in"
"${MRN_TEST_SUITE_DIR}/storage/r/information_schema_plugins.result"
NEWLINE_STYLE LF)
configure_file(
"${MRN_TEST_SUITE_DIR}/storage/r/variable_version.result.in"
"${MRN_TEST_SUITE_DIR}/storage/r/variable_version.result"
NEWLINE_STYLE LF)
configure_file(
"${PROJECT_SOURCE_DIR}/data/install.sql.in"

12
storage/mroonga/ha_mroonga.cpp
View file

@ -16805,10 +16805,10 @@ int ha_mroonga::get_parent_foreign_key_list(THD *thd,
DBUG_RETURN(res);
}
uint ha_mroonga::wrapper_referenced_by_foreign_key()
inline bool ha_mroonga::wrapper_referenced_by_foreign_key() const noexcept
{
MRN_DBUG_ENTER_METHOD();
uint res;
bool res;
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
res = wrap_handler->referenced_by_foreign_key();
@ -16817,17 +16817,17 @@ uint ha_mroonga::wrapper_referenced_by_foreign_key()
DBUG_RETURN(res);
}
uint ha_mroonga::storage_referenced_by_foreign_key()
inline bool ha_mroonga::storage_referenced_by_foreign_key() const noexcept
{
MRN_DBUG_ENTER_METHOD();
uint res = handler::referenced_by_foreign_key();
bool res = handler::referenced_by_foreign_key();
DBUG_RETURN(res);
}
uint ha_mroonga::referenced_by_foreign_key()
bool ha_mroonga::referenced_by_foreign_key() const noexcept
{
MRN_DBUG_ENTER_METHOD();
uint res;
bool res;
if (share->wrapper_mode)
{
res = wrapper_referenced_by_foreign_key();

6
storage/mroonga/ha_mroonga.hpp
View file

@ -618,7 +618,7 @@ protected:
bool can_switch_engines() mrn_override;
int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) mrn_override;
int get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) mrn_override;
uint referenced_by_foreign_key() mrn_override;
bool referenced_by_foreign_key() const noexcept mrn_override;
void init_table_handle_for_HANDLER() mrn_override;
void free_foreign_key_create_info(char* str) mrn_override;
#ifdef MRN_HAVE_HA_REBIND_PSI
@ -1268,8 +1268,8 @@ private:
int storage_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
int wrapper_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
int storage_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
uint wrapper_referenced_by_foreign_key();
uint storage_referenced_by_foreign_key();
bool wrapper_referenced_by_foreign_key() const noexcept;
bool storage_referenced_by_foreign_key() const noexcept;
void wrapper_init_table_handle_for_HANDLER();
void storage_init_table_handle_for_HANDLER();
void wrapper_free_foreign_key_create_info(char* str);

4
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result Normal file
View file

@ -0,0 +1,4 @@
select PLUGIN_NAME, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga";
PLUGIN_NAME PLUGIN_TYPE
Mroonga STORAGE ENGINE

4
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result.in
View file

@ -1,4 +0,0 @@
select PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga";
PLUGIN_NAME PLUGIN_VERSION PLUGIN_TYPE
Mroonga @MRN_PLUGIN_VERSION@ STORAGE ENGINE

2
storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result.in → storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
View file

@ -1,3 +1,3 @@
show variables like 'mroonga_version';
Variable_name Value
mroonga_version @MRN_VERSION@
mroonga_version #

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_flags_comment.test
View file

@ -30,7 +30,10 @@ CREATE TABLE tags (
ALTER TABLE tags ADD COLUMN name VARCHAR(64) COMMENT 'flags "COLUMN_VECTOR"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_flags_parameter.test
View file

@ -33,7 +33,10 @@ CREATE TABLE tags (
ALTER TABLE tags ADD COLUMN name VARCHAR(64) FLAGS='COLUMN_VECTOR';
SHOW CREATE TABLE tags;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_groonga_type_comment.test
View file

@ -35,7 +35,10 @@ CREATE TABLE bugs (
ALTER TABLE bugs ADD COLUMN name VARCHAR(64) COMMENT 'groonga_type "tags"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_groonga_type_parameter.test
View file

@ -38,7 +38,10 @@ CREATE TABLE bugs (
ALTER TABLE bugs ADD COLUMN name VARCHAR(64) GROONGA_TYPE='tags';
SHOW CREATE TABLE bugs;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_cp932.test
View file

@ -45,7 +45,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_multibyte_utf8.test
View file

@ -45,7 +45,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_column_type_comment.test
View file

@ -34,7 +34,10 @@ CREATE TABLE bugs (
ALTER TABLE bugs ADD COLUMN name VARCHAR(64) COMMENT 'type "tags"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_add_index_token_filters_one_token_filter.test
View file

@ -34,7 +34,10 @@ CREATE TABLE memos (
ALTER TABLE memos ADD FULLTEXT INDEX (content) COMMENT 'token_filters "TokenFilterStopWord"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_change_token_filter.test
View file

@ -37,6 +37,8 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'table "terms"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
ALTER TABLE terms COMMENT='default_tokenizer "TokenBigram", token_filters "TokenFilterStopWord"';
@ -47,6 +49,7 @@ ALTER TABLE memos DISABLE KEYS;
ALTER TABLE memos ENABLE KEYS;
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;
DROP TABLE terms;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_disable_keys_fulltext_table.test
View file

@ -35,9 +35,12 @@ CREATE TABLE memos (
FULLTEXT INDEX content_index (content) COMMENT 'table "terms"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
ALTER TABLE memos DISABLE KEYS;
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;
DROP TABLE terms;

3
storage/mroonga/mysql-test/mroonga/storage/t/alter_table_enable_keys_fulltext_table.test
View file

@ -35,10 +35,13 @@ CREATE TABLE memos (
FULLTEXT INDEX content_index (content) COMMENT 'table "terms"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
ALTER TABLE memos DISABLE KEYS;
SELECT mroonga_command("dump --dump_plugins no");
ALTER TABLE memos ENABLE KEYS;
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;
DROP TABLE terms;

3
storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_fulltext_vector_other_table.test
View file

@ -39,7 +39,10 @@ CREATE TABLE bugs (
INSERT INTO bugs (id, tags) VALUES (1, "Linux MySQL groonga");
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
SELECT *, MATCH (tags) AGAINST ("+MySQL" IN BOOLEAN MODE) AS score
FROM bugs

3
storage/mroonga/mysql-test/mroonga/storage/t/column_groonga_index_int_other_table.test
View file

@ -40,7 +40,10 @@ INSERT INTO bugs (id, priority) VALUES (1, 10);
INSERT INTO bugs (id, priority) VALUES (2, 3);
INSERT INTO bugs (id, priority) VALUES (3, -2);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
SELECT *
FROM bugs

3
storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_cp932.test
View file

@ -43,7 +43,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/storage/t/column_multibyte_utf8.test
View file

@ -43,7 +43,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_column_flags_comment.test
View file

@ -29,7 +29,10 @@ CREATE TABLE bugs (
tags TEXT COMMENT 'flags "COLUMN_VECTOR"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_column_flags_parameter.test
View file

@ -30,7 +30,10 @@ CREATE TABLE bugs (
tags TEXT FLAGS='COLUMN_VECTOR'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_column_groonga_type_comment.test
View file

@ -33,7 +33,10 @@ CREATE TABLE bugs (
tag VARCHAR(64) COMMENT 'groonga_type "tags"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_column_groonga_type_parameter.test
View file

@ -36,7 +36,10 @@ CREATE TABLE bugs (
) DEFAULT CHARSET=utf8;
SHOW CREATE TABLE bugs;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_column_type_comment.test
View file

@ -33,7 +33,10 @@ CREATE TABLE bugs (
tag VARCHAR(64) COMMENT 'type "tags"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_default_tokenizer.test
View file

@ -30,7 +30,10 @@ CREATE TABLE tags (
COLLATE=utf8_bin
COMMENT='default_tokenizer "TokenDelimit"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE tags;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_normalizer_index_bin.test
View file

@ -29,7 +29,10 @@ CREATE TABLE diaries (
INDEX (content) COMMENT 'normalizer "NormalizerAuto"'
) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE diaries;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_token_filters_multiple_token_filters.test
View file

@ -33,7 +33,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'token_filters "TokenFilterStopWord,TokenFilterStopWord"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_token_filters_one_token_filter.test
View file

@ -33,7 +33,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'token_filters "TokenFilterStopWord"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_token_filters_parameter.test
View file

@ -36,7 +36,10 @@ CREATE TABLE memos (
) DEFAULT CHARSET=utf8;
SHOW CREATE TABLE memos;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_table_token_filters_multiple_token_filters.test
View file

@ -37,7 +37,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'table "terms"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;
DROP TABLE terms;

3
storage/mroonga/mysql-test/mroonga/storage/t/create_table_table_token_filters_one_token_filter.test
View file

@ -37,7 +37,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'table "terms"'
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;
DROP TABLE terms;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_delete_existent.test
View file

@ -44,7 +44,10 @@ DELETE FROM comments WHERE id = 100;
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_delete_nonexistent.test
View file

@ -44,7 +44,10 @@ DELETE FROM comments WHERE id = 200;
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_insert_existent.test
View file

@ -42,7 +42,10 @@ INSERT INTO entries (content, comment_id) VALUES ('Hello!', 100);
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_insert_nonexistent.test
View file

@ -42,7 +42,10 @@ INSERT INTO entries (content, comment_id) VALUES ('Hello!', 1);
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_update_existent.test
View file

@ -44,7 +44,10 @@ UPDATE entries SET comment_id = 200 WHERE content = 'Hello!';
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/foreign_key_update_nonexistent.test
View file

@ -44,7 +44,10 @@ UPDATE entries SET comment_id = 200 WHERE content = 'Hello!';
SELECT * FROM entries;
SELECT * FROM comments;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE entries;
DROP TABLE comments;

3
storage/mroonga/mysql-test/mroonga/storage/t/function_command_auto-escape.test
View file

@ -31,9 +31,12 @@ CREATE TABLE diaries (
INSERT INTO diaries VALUES('It is Groonga');
INSERT INTO diaries VALUES('It is Mroonga');
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('select',
'table', 'diaries',
'filter', 'title @ "Groonga"');
--enable_cursor_protocol
DROP TABLE diaries;

3
storage/mroonga/mysql-test/mroonga/storage/t/function_command_special-database-name.test
View file

@ -30,7 +30,10 @@ CREATE TABLE diaries (
FULLTEXT KEY (title)
) DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command('dump --dump_plugins no');
--enable_cursor_protocol
DROP TABLE diaries;

3
storage/mroonga/mysql-test/mroonga/storage/t/function_highlight_html_dynamic_keyword.test
View file

@ -32,9 +32,12 @@ CREATE TABLE keywords (
INSERT INTO keywords VALUES ('Mroonga');
INSERT INTO keywords VALUES ('Groonga');
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_highlight_html('Mroonga is the Groonga based storage engine.',
keyword) AS highlighted
FROM keywords;
--enable_cursor_protocol
--disable_query_log
DROP TABLE keywords;

3
storage/mroonga/mysql-test/mroonga/storage/t/function_highlight_html_multiple_keywords.test
View file

@ -18,8 +18,11 @@
--source ../../include/mroonga/have_mroonga.inc
--source ../../include/mroonga/load_mroonga_functions.inc
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_highlight_html('Mroonga is the Groonga based storage engine.',
'Mroonga', 'Groonga') AS highlighted;
--enable_cursor_protocol
--source ../../include/mroonga/unload_mroonga_functions.inc
--source ../../include/mroonga/have_mroonga_deinit.inc

3
storage/mroonga/mysql-test/mroonga/storage/t/function_highlight_html_normalizer.test
View file

@ -18,8 +18,11 @@
--source ../../include/mroonga/have_mroonga.inc
--source ../../include/mroonga/load_mroonga_functions.inc
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_highlight_html('Mroonga is the Groonga based storage engine.',
'mroonga') AS highlighted;
--enable_cursor_protocol
--source ../../include/mroonga/unload_mroonga_functions.inc
--source ../../include/mroonga/have_mroonga_deinit.inc

3
storage/mroonga/mysql-test/mroonga/storage/t/function_normalize_default.test
View file

@ -18,7 +18,10 @@
--source ../../include/mroonga/have_mroonga.inc
--source ../../include/mroonga/load_mroonga_functions.inc
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_normalize('aBcＡｂＣ㍑');
--enable_cursor_protocol
--source ../../include/mroonga/unload_mroonga_functions.inc
--source ../../include/mroonga/have_mroonga_deinit.inc

3
storage/mroonga/mysql-test/mroonga/storage/t/function_normalize_normalizer.test
View file

@ -18,7 +18,10 @@
--source ../../include/mroonga/have_mroonga.inc
--source ../../include/mroonga/load_mroonga_functions.inc
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_normalize('aBcＡｂＣ㍑', "NormalizerAuto");
--enable_cursor_protocol
--source ../../include/mroonga/unload_mroonga_functions.inc
--source ../../include/mroonga/have_mroonga_deinit.inc

3
storage/mroonga/mysql-test/mroonga/storage/t/function_snippet_html_dynamic_keyword.test
View file

@ -32,9 +32,12 @@ CREATE TABLE keywords (
INSERT INTO keywords VALUES ('Mroonga');
INSERT INTO keywords VALUES ('Groonga');
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_snippet_html('Mroonga is the Groonga based storage engine.',
keyword) as snippet
FROM keywords;
--enable_cursor_protocol
--disable_query_log
DROP TABLE keywords;

3
storage/mroonga/mysql-test/mroonga/storage/t/function_snippet_html_multiple_keywords.test
View file

@ -18,8 +18,11 @@
--source ../../include/mroonga/have_mroonga.inc
--source ../../include/mroonga/load_mroonga_functions.inc
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_snippet_html('Mroonga is the Groonga based storage engine.',
'Mroonga', 'Groonga') as snippet;
--enable_cursor_protocol
--source ../../include/mroonga/unload_mroonga_functions.inc
--source ../../include/mroonga/have_mroonga_deinit.inc

2
storage/mroonga/mysql-test/mroonga/storage/t/information_schema_plugins.test
View file

@ -16,7 +16,7 @@
--source ../../include/mroonga/have_mroonga.inc
select PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE
select PLUGIN_NAME, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga";
--source ../../include/mroonga/have_mroonga_deinit.inc

1
storage/mroonga/mysql-test/mroonga/storage/t/variable_version.test
View file

@ -17,6 +17,7 @@
--source ../../include/mroonga/have_mroonga.inc
# show variables like 'groonga%';
--replace_column 2 #
show variables like 'mroonga_version';
--source ../../include/mroonga/have_mroonga_deinit.inc

3
storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_cp932.test
View file

@ -46,7 +46,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/alter_table_add_column_multibyte_utf8.test
View file

@ -46,7 +46,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_cp932.test
View file

@ -45,7 +45,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/column_multibyte_utf8.test
View file

@ -45,7 +45,10 @@ SELECT * FROM users;
SELECT * FROM users
WHERE MATCH (名前) AGAINST ('+たなか' IN BOOLEAN MODE);
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no --dump_records no");
--enable_cursor_protocol
DROP TABLE users;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_comment_combined.test
View file

@ -27,7 +27,10 @@ CREATE TABLE bugs (
) DEFAULT CHARSET=utf8
COMMENT='Free style normal comment, engine "InnoDB"';
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE bugs;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_token_filters_index_multiple_token_filters.test
View file

@ -35,7 +35,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'token_filters "TokenFilterStopWord,TokenFilterStopWord"'
) COMMENT='engine "InnoDB"' DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_token_filters_index_one_token_filter.test
View file

@ -35,7 +35,10 @@ CREATE TABLE memos (
FULLTEXT INDEX (content) COMMENT 'token_filters "TokenFilterStopWord"'
) COMMENT='engine "InnoDB"' DEFAULT CHARSET=utf8;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

3
storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_token_filters_index_parameter.test
View file

@ -38,7 +38,10 @@ CREATE TABLE memos (
) COMMENT='ENGINE "InnoDB"' DEFAULT CHARSET=utf8;
SHOW CREATE TABLE memos;
#Check after fix MDEV-31554
--disable_cursor_protocol
SELECT mroonga_command("dump --dump_plugins no");
--enable_cursor_protocol
DROP TABLE memos;

6
storage/mroonga/vendor/groonga/lib/proc/proc_object.c vendored
View file

@ -69,13 +69,15 @@ command_object_remove(grn_ctx *ctx,
grn_obj **args,
grn_user_data *user_data)
{
grn_obj *db;
grn_obj *name;
grn_bool force;
grn_obj *target;
grn_bool failed_to_open;
db = grn_ctx_db(ctx);
if (!grn_ctx_db(ctx)) {
GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, "invalid db assigned");
return NULL;
}
name = grn_plugin_proc_get_var(ctx, user_data, "name", -1);
force = grn_plugin_proc_get_var_bool(ctx, user_data, "force", -1, GRN_FALSE);

3
storage/mroonga/vendor/groonga/plugins/functions/index_column.c vendored
View file

@ -91,8 +91,7 @@ selector_index_column_df_ratio_between(grn_ctx *ctx,
df_ratio = (double)n_match_documents / (double)n_documents;
{
void *key;
int key_size;
key_size = grn_table_cursor_get_key(ctx, cursor, &key);
grn_table_cursor_get_key(ctx, cursor, &key);
}
if (min <= df_ratio && df_ratio <= max) {
posting.rid = term_id;

3
storage/mroonga/vendor/groonga/plugins/query_expanders/tsv.c vendored
View file

@ -196,7 +196,6 @@ load_synonyms(grn_ctx *ctx)
const char *path;
grn_file_reader *file_reader;
int number_of_lines;
grn_encoding encoding;
grn_obj line, key, value;
grn_getenv("GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE",
@ -234,7 +233,7 @@ load_synonyms(grn_ctx *ctx)
}
number_of_lines++;
if (number_of_lines == 1) {
encoding = guess_encoding(ctx, &line_value, &line_length);
guess_encoding(ctx, &line_value, &line_length);
}
GRN_BULK_REWIND(&key);
GRN_BULK_REWIND(&value);

4
storage/mroonga/vendor/groonga/plugins/suggest/suggest.c vendored
View file

@ -653,7 +653,7 @@ learner_init(grn_ctx *ctx, grn_suggest_learner *learner,
static void
learner_init_columns(grn_ctx *ctx, grn_suggest_learner *learner)
{
grn_id events_id, event_types_id;
grn_id events_id;
grn_obj *seqs, *events, *post_item, *items, *pairs;
learner->seqs = seqs = grn_ctx_at(ctx, GRN_OBJ_GET_DOMAIN(learner->seq));
@ -665,7 +665,7 @@ learner_init_columns(grn_ctx *ctx, grn_suggest_learner *learner)
learner->events_type = grn_obj_column(ctx, events, CONST_STR_LEN("type"));
learner->events_time = grn_obj_column(ctx, events, CONST_STR_LEN("time"));
event_types_id = grn_obj_get_range(ctx, learner->events_type);
grn_obj_get_range(ctx, learner->events_type);
learner->event_types = grn_obj_column(ctx, events, CONST_STR_LEN("time"));
post_item = learner->post_item;