diff options
Diffstat (limited to 'storage/mroonga/mysql-test')
11 files changed, 47 insertions, 17 deletions
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 index 7f9ddd50e92..34545ecc30a 100644 --- 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 index 320fb9a5635..f827c0ad529 100644 --- 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 index 8b92ec4137e..adf6b3a4770 100644 --- 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/r/i_s.result b/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result new file mode 100644 index 00000000000..b403eccf1ab --- /dev/null +++ b/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result @@ -0,0 +1,7 @@ +SHOW CREATE TABLE INFORMATION_SCHEMA.MROONGA_STATS; +Table Create Table +Mroonga_stats CREATE TEMPORARY TABLE `Mroonga_stats` ( + `VERSION` varchar(40) NOT NULL DEFAULT '', + `rows_written` int(11) NOT NULL DEFAULT 0, + `rows_read` int(11) NOT NULL DEFAULT 0 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result index 199edf9d758..a1a123e7d5f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result @@ -14,5 +14,5 @@ COUNT(*) 2 SHOW STATUS LIKE 'mroonga_count_skip'; Variable_name Value -Mroonga_count_skip 0 +Mroonga_count_skip 2 DROP TABLE users; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result index 1b253a8edc6..64761c9565d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result @@ -13,5 +13,5 @@ COUNT(*) 4 SHOW STATUS LIKE 'mroonga_count_skip'; Variable_name Value -Mroonga_count_skip 0 +Mroonga_count_skip 1 DROP TABLE users; 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 index 75ee1882271..773c740b733 100644 --- 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 index 7888cb33861..f62a6a0fe6c 100644 --- 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 index 442aceccd2e..bab9f9179c1 100644 --- 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 diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/i_s.test b/storage/mroonga/mysql-test/mroonga/storage/t/i_s.test new file mode 100644 index 00000000000..fdb8e205b38 --- /dev/null +++ b/storage/mroonga/mysql-test/mroonga/storage/t/i_s.test @@ -0,0 +1,23 @@ +# Copyright (c) 2019, MariaDB +# Copyright(C) 2014 Naoya Murakami <naoya@createfield.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-1335 USA + +--source include/not_embedded.inc +--source ../../include/mroonga/have_mroonga.inc + +SHOW CREATE TABLE INFORMATION_SCHEMA.MROONGA_STATS; + +--source ../../include/mroonga/have_mroonga_deinit.inc diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_rollback_delete_delete.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_rollback_delete_delete.result index 9082032ff6e..8c61d9e865a 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_rollback_delete_delete.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_rollback_delete_delete.result @@ -28,7 +28,7 @@ MATCH(body) AGAINST("groonga"); id title body DELETE FROM diaries WHERE id = 1; Warnings: -Warning 1026 failed to get record ID for deleting from groonga: key=<> +Warning 1026 failed to get record ID for deleting from groonga: key=<\0001> SELECT * FROM diaries; id title body 2 groonga (1) starting groonga... |