diff options
Diffstat (limited to 'storage/mroonga/mysql-test')
9 files changed, 5 insertions, 225 deletions
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result deleted file mode 100644 index 29f27d15..00000000 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result +++ /dev/null @@ -1,29 +0,0 @@ -DROP TABLE IF EXISTS diaries; -CREATE TABLE diaries ( -id int PRIMARY KEY AUTO_INCREMENT, -body text, -FULLTEXT INDEX body_index (body) -COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"' -) DEFAULT CHARSET utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO diaries (body) VALUES ("will start Groonga!"); -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO diaries (body) VALUES ("starting Groonga..."); -INSERT INTO diaries (body) VALUES ("started Groonga."); -SELECT * FROM diaries; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -SELECT * FROM diaries -WHERE MATCH(body) AGAINST("+start" IN BOOLEAN MODE) -ORDER BY id; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -DROP TABLE diaries; -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/create_table_index_parser_off.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result deleted file mode 100644 index f827c0ad..00000000 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result +++ /dev/null @@ -1,40 +0,0 @@ -DROP TABLE IF EXISTS variables; -CREATE TABLE variables ( -id INT PRIMARY KEY AUTO_INCREMENT, -name TEXT, -FULLTEXT INDEX (name) COMMENT 'parser "off"' -) DEFAULT CHARSET=utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -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_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"); -INSERT INTO variables (name) VALUES ("mroonga_libgroonga_version"); -INSERT INTO variables (name) VALUES ("mroonga_log_file"); -INSERT INTO variables (name) VALUES ("mroonga_log_level"); -INSERT INTO variables (name) VALUES ("mroonga_match_escalation_threshold"); -INSERT INTO variables (name) VALUES ("mroonga_version"); -SELECT * FROM variables; -id name -1 mroonga_database_path_prefix -2 mroonga_default_tokenizer -3 mroonga_default_wrapper_engine -4 mroonga_dry_write -5 mroonga_enable_optimization -6 mroonga_libgroonga_version -7 mroonga_log_file -8 mroonga_log_level -9 mroonga_match_escalation_threshold -10 mroonga_version -SELECT * FROM variables -WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE); -id name -3 mroonga_default_wrapper_engine -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/optimization_count_skip_index_not_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result index a1a123e7..837ca2b6 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 @@ -9,6 +9,9 @@ INSERT INTO users (age) VALUES (28); INSERT INTO users (age) VALUES (29); INSERT INTO users (age) VALUES (29); INSERT INTO users (age) VALUES (29); +explain SELECT COUNT(*) FROM users WHERE age <> 29; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE users range age age 5 NULL 4 Using where; Using index SELECT COUNT(*) FROM users WHERE age <> 29; COUNT(*) 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test deleted file mode 100644 index c4bc32d1..00000000 --- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright(C) 2011-2015 Kouhei Sutou <kou@clear-code.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 - ---disable_warnings -DROP TABLE IF EXISTS diaries; ---enable_warnings - -CREATE TABLE diaries ( - id int PRIMARY KEY AUTO_INCREMENT, - body text, - FULLTEXT INDEX body_index (body) - COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"' -) DEFAULT CHARSET utf8; - ---enable_prepare_warnings -INSERT INTO diaries (body) VALUES ("will start Groonga!"); -INSERT INTO diaries (body) VALUES ("starting Groonga..."); -INSERT INTO diaries (body) VALUES ("started Groonga."); - -SELECT * FROM diaries; -SELECT * FROM diaries - WHERE MATCH(body) AGAINST("+start" IN BOOLEAN MODE) - ORDER BY id; - -DROP TABLE diaries; - ---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 deleted file mode 100644 index 2191a28c..00000000 --- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright(C) 2013 Kouhei Sutou <kou@clear-code.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 - ---disable_warnings -DROP TABLE IF EXISTS variables; ---enable_warnings - -CREATE TABLE variables ( - id INT PRIMARY KEY AUTO_INCREMENT, - name TEXT, - FULLTEXT INDEX (name) COMMENT 'parser "off"' -) DEFAULT CHARSET=utf8; - ---enable_prepare_warnings -INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix"); -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"); -INSERT INTO variables (name) VALUES ("mroonga_libgroonga_version"); -INSERT INTO variables (name) VALUES ("mroonga_log_file"); -INSERT INTO variables (name) VALUES ("mroonga_log_level"); -INSERT INTO variables (name) VALUES ("mroonga_match_escalation_threshold"); -INSERT INTO variables (name) VALUES ("mroonga_version"); - -SELECT * FROM variables; -SELECT * FROM variables - WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE); - -DROP TABLE variables; - ---source ../../include/mroonga/have_mroonga_deinit.inc diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test index f75c8b4e..ed696c71 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test @@ -34,6 +34,7 @@ INSERT INTO users (age) VALUES (29); INSERT INTO users (age) VALUES (29); --disable_ps2_protocol +explain SELECT COUNT(*) FROM users WHERE age <> 29; SELECT COUNT(*) FROM users WHERE age <> 29; --enable_ps2_protocol diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result deleted file mode 100644 index 4d9d20dc..00000000 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result +++ /dev/null @@ -1,25 +0,0 @@ -drop table if exists diaries; -create table diaries ( -id int primary key auto_increment, -body text, -fulltext index body_index (body) -comment 'parser "TokenBigramSplitSymbolAlphaDigit"' -) comment = 'engine "innodb"' default charset utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -insert into diaries (body) values ("will start Groonga!"); -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -insert into diaries (body) values ("starting Groonga..."); -insert into diaries (body) values ("started Groonga."); -select * from diaries; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -select * from diaries where match(body) against("+start" in boolean mode) order by id; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -drop table diaries; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/geometry_contains.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/geometry_contains.result index 550554ea..6dd6dd25 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/geometry_contains.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/geometry_contains.result @@ -154,7 +154,7 @@ id name location_text select id, name, ST_AsText(location) as location_text from shops where MBRContains(ST_GeomFromText('LineString(139.7727 35.6684, 139.7038 35.7121)'), location); id name location_text +26 kazuya POINT(139.760895 35.673508) 14 tetsuji POINT(139.76857 35.680912) 19 daruma POINT(139.770599 35.681461) -26 kazuya POINT(139.760895 35.673508) drop table shops; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test deleted file mode 100644 index 81342a74..00000000 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright(C) 2011-2015 Kouhei Sutou <kou@clear-code.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/have_innodb.inc ---source ../../include/mroonga/have_mroonga.inc - ---disable_warnings -drop table if exists diaries; ---enable_warnings - -create table diaries ( - id int primary key auto_increment, - body text, - fulltext index body_index (body) - comment 'parser "TokenBigramSplitSymbolAlphaDigit"' -) comment = 'engine "innodb"' default charset utf8; ---enable_prepare_warnings -insert into diaries (body) values ("will start Groonga!"); -insert into diaries (body) values ("starting Groonga..."); -insert into diaries (body) values ("started Groonga."); -select * from diaries; -select * from diaries where match(body) against("+start" in boolean mode) order by id; -drop table diaries; - ---source ../../include/mroonga/have_mroonga_deinit.inc |