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.
MariaDB · Feb 13, 2020 · 5aebd78 · 5aebd78
1 parent a05b38c
commit 5aebd78
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp
@@ -965,7 +965,7 @@ static MYSQL_SYSVAR_STR(default_parser, mrn_default_tokenizer,
                         "(Deprecated. Use mroonga_default_tokenizer instead.)",
                         NULL,
                         mrn_default_tokenizer_update,
-                        MRN_DEFAULT_TOKENIZER);
+                        MRN_DEFAULT_TOKENIZER); // since 10.1.6
 
 static MYSQL_SYSVAR_STR(default_tokenizer, mrn_default_tokenizer,
                         PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,

diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_default.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_default.result
@@ -1,6 +1,6 @@
 drop table if exists diaries;
-set @mroonga_default_parser_backup=@@mroonga_default_parser;
-set global mroonga_default_parser=TokenBigramSplitSymbolAlphaDigit;
+set @mroonga_default_tokenizer_backup=@@mroonga_default_tokenizer;
+set global mroonga_default_tokenizer=TokenBigramSplitSymbolAlphaDigit;
 create table diaries (
 id int primary key auto_increment,
 body text,
@@ -22,4 +22,4 @@ id	body
 2	starting Groonga...
 3	started Groonga.
 drop table diaries;
-set global mroonga_default_parser=@mroonga_default_parser_backup;
+set global mroonga_default_tokenizer=@mroonga_default_tokenizer_backup;
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result
@@ -9,7 +9,7 @@ Warning	1287	'parser' is deprecated and will be removed in a future release. Ple
 INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix");
 Warnings:
 Warning	1287	'parser' is deprecated and will be removed in a future release. Please use tokenizer instead
-INSERT INTO variables (name) VALUES ("mroonga_default_parser");
+INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer");
 INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine");
 INSERT INTO variables (name) VALUES ("mroonga_dry_write");
 INSERT INTO variables (name) VALUES ("mroonga_enable_optimization");
@@ -21,7 +21,7 @@ INSERT INTO variables (name) VALUES ("mroonga_version");
 SELECT * FROM variables;
 id	name
 1	mroonga_database_path_prefix
-2	mroonga_default_parser
+2	mroonga_default_tokenizer
 3	mroonga_default_wrapper_engine
 4	mroonga_dry_write
 5	mroonga_enable_optimization
@@ -34,7 +34,7 @@ SELECT * FROM variables
 WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE);
 id	name
 3	mroonga_default_wrapper_engine
-2	mroonga_default_parser
+2	mroonga_default_tokenizer
 DROP TABLE variables;
 Warnings:
 Warning	1287	'parser' is deprecated and will be removed in a future release. Please use tokenizer instead
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/function_escape_query_match_against.result b/storage/mroonga/mysql-test/mroonga/storage/r/function_escape_query_match_against.result
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS memos;
-SET GLOBAL mroonga_default_parser = TokenDelimit;
+SET GLOBAL mroonga_default_tokenizer = TokenDelimit;
 SET NAMES utf8mb4;
 CREATE TABLE memos (
 id INT PRIMARY KEY,
@@ -15,4 +15,4 @@ id	content
 1	(Groonga) Installed!
 3	(Groonga) Upgraded!
 DROP TABLE memos;
-SET GLOBAL mroonga_default_parser = TokenBigram;
+SET GLOBAL mroonga_default_tokenizer = TokenBigram;
diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_default.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_default.test
@@ -21,8 +21,8 @@
 drop table if exists diaries;
 --enable_warnings
 
-set @mroonga_default_parser_backup=@@mroonga_default_parser;
-set global mroonga_default_parser=TokenBigramSplitSymbolAlphaDigit;
+set @mroonga_default_tokenizer_backup=@@mroonga_default_tokenizer;
+set global mroonga_default_tokenizer=TokenBigramSplitSymbolAlphaDigit;
 create table diaries (
   id int primary key auto_increment,
   body text,
@@ -35,6 +35,6 @@ insert into diaries (body) values ("finished Groonga.");
 select * from diaries;
 select * from diaries where match(body) against("+start" IN BOOLEAN MODE) order by id;
 drop table diaries;
-set global mroonga_default_parser=@mroonga_default_parser_backup;
+set global mroonga_default_tokenizer=@mroonga_default_tokenizer_backup;
 
 --source ../../include/mroonga/have_mroonga_deinit.inc
diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test
@@ -28,7 +28,7 @@ CREATE TABLE variables (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix");
-INSERT INTO variables (name) VALUES ("mroonga_default_parser");
+INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer");
 INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine");
 INSERT INTO variables (name) VALUES ("mroonga_dry_write");
 INSERT INTO variables (name) VALUES ("mroonga_enable_optimization");

diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/function_escape_query_match_against.test b/storage/mroonga/mysql-test/mroonga/storage/t/function_escape_query_match_against.test
@@ -22,7 +22,7 @@
 DROP TABLE IF EXISTS memos;
 --enable_warnings
 
-SET GLOBAL mroonga_default_parser = TokenDelimit;
+SET GLOBAL mroonga_default_tokenizer = TokenDelimit;
 
 SET NAMES utf8mb4;
 CREATE TABLE memos (
@@ -40,7 +40,7 @@ SELECT * FROM memos
 
 DROP TABLE memos;
 
-SET GLOBAL mroonga_default_parser = TokenBigram;
+SET GLOBAL mroonga_default_tokenizer = TokenBigram;
 
 --source ../../include/mroonga/unload_mroonga_functions.inc
 --source ../../include/mroonga/have_mroonga_deinit.inc