Skip to content

Commit 5aebd78

Browse files
committed
MDEV-18650: Options deprecated in previous versions - mroonga_default_parser
Variable is marked as deprecated since 10.1.6. Update tests to not make use of it.
1 parent a05b38c commit 5aebd78

7 files changed

+15
-15
lines changed

storage/mroonga/ha_mroonga.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ static MYSQL_SYSVAR_STR(default_parser, mrn_default_tokenizer,
965965
"(Deprecated. Use mroonga_default_tokenizer instead.)",
966966
NULL,
967967
mrn_default_tokenizer_update,
968-
MRN_DEFAULT_TOKENIZER);
968+
MRN_DEFAULT_TOKENIZER); // since 10.1.6
969969

970970
static MYSQL_SYSVAR_STR(default_tokenizer, mrn_default_tokenizer,
971971
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,

storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_default.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
drop table if exists diaries;
2-
set @mroonga_default_parser_backup=@@mroonga_default_parser;
3-
set global mroonga_default_parser=TokenBigramSplitSymbolAlphaDigit;
2+
set @mroonga_default_tokenizer_backup=@@mroonga_default_tokenizer;
3+
set global mroonga_default_tokenizer=TokenBigramSplitSymbolAlphaDigit;
44
create table diaries (
55
id int primary key auto_increment,
66
body text,
@@ -22,4 +22,4 @@ id body
2222
2 starting Groonga...
2323
3 started Groonga.
2424
drop table diaries;
25-
set global mroonga_default_parser=@mroonga_default_parser_backup;
25+
set global mroonga_default_tokenizer=@mroonga_default_tokenizer_backup;

storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Warning 1287 'parser' is deprecated and will be removed in a future release. Ple
99
INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix");
1010
Warnings:
1111
Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead
12-
INSERT INTO variables (name) VALUES ("mroonga_default_parser");
12+
INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer");
1313
INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine");
1414
INSERT INTO variables (name) VALUES ("mroonga_dry_write");
1515
INSERT INTO variables (name) VALUES ("mroonga_enable_optimization");
@@ -21,7 +21,7 @@ INSERT INTO variables (name) VALUES ("mroonga_version");
2121
SELECT * FROM variables;
2222
id name
2323
1 mroonga_database_path_prefix
24-
2 mroonga_default_parser
24+
2 mroonga_default_tokenizer
2525
3 mroonga_default_wrapper_engine
2626
4 mroonga_dry_write
2727
5 mroonga_enable_optimization
@@ -34,7 +34,7 @@ SELECT * FROM variables
3434
WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE);
3535
id name
3636
3 mroonga_default_wrapper_engine
37-
2 mroonga_default_parser
37+
2 mroonga_default_tokenizer
3838
DROP TABLE variables;
3939
Warnings:
4040
Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead

storage/mroonga/mysql-test/mroonga/storage/r/function_escape_query_match_against.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DROP TABLE IF EXISTS memos;
2-
SET GLOBAL mroonga_default_parser = TokenDelimit;
2+
SET GLOBAL mroonga_default_tokenizer = TokenDelimit;
33
SET NAMES utf8mb4;
44
CREATE TABLE memos (
55
id INT PRIMARY KEY,
@@ -15,4 +15,4 @@ id content
1515
1 (Groonga) Installed!
1616
3 (Groonga) Upgraded!
1717
DROP TABLE memos;
18-
SET GLOBAL mroonga_default_parser = TokenBigram;
18+
SET GLOBAL mroonga_default_tokenizer = TokenBigram;

storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_default.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
drop table if exists diaries;
2222
--enable_warnings
2323

24-
set @mroonga_default_parser_backup=@@mroonga_default_parser;
25-
set global mroonga_default_parser=TokenBigramSplitSymbolAlphaDigit;
24+
set @mroonga_default_tokenizer_backup=@@mroonga_default_tokenizer;
25+
set global mroonga_default_tokenizer=TokenBigramSplitSymbolAlphaDigit;
2626
create table diaries (
2727
id int primary key auto_increment,
2828
body text,
@@ -35,6 +35,6 @@ insert into diaries (body) values ("finished Groonga.");
3535
select * from diaries;
3636
select * from diaries where match(body) against("+start" IN BOOLEAN MODE) order by id;
3737
drop table diaries;
38-
set global mroonga_default_parser=@mroonga_default_parser_backup;
38+
set global mroonga_default_tokenizer=@mroonga_default_tokenizer_backup;
3939

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

storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CREATE TABLE variables (
2828
) DEFAULT CHARSET=utf8;
2929

3030
INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix");
31-
INSERT INTO variables (name) VALUES ("mroonga_default_parser");
31+
INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer");
3232
INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine");
3333
INSERT INTO variables (name) VALUES ("mroonga_dry_write");
3434
INSERT INTO variables (name) VALUES ("mroonga_enable_optimization");

storage/mroonga/mysql-test/mroonga/storage/t/function_escape_query_match_against.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
DROP TABLE IF EXISTS memos;
2323
--enable_warnings
2424

25-
SET GLOBAL mroonga_default_parser = TokenDelimit;
25+
SET GLOBAL mroonga_default_tokenizer = TokenDelimit;
2626

2727
SET NAMES utf8mb4;
2828
CREATE TABLE memos (
@@ -40,7 +40,7 @@ SELECT * FROM memos
4040

4141
DROP TABLE memos;
4242

43-
SET GLOBAL mroonga_default_parser = TokenBigram;
43+
SET GLOBAL mroonga_default_tokenizer = TokenBigram;
4444

4545
--source ../../include/mroonga/unload_mroonga_functions.inc
4646
--source ../../include/mroonga/have_mroonga_deinit.inc

0 commit comments

Comments
 (0)