Kouhei Sutou
null+****@clear*****
Sun Jul 29 18:33:06 JST 2018
Kouhei Sutou 2018-07-29 18:33:06 +0900 (Sun, 29 Jul 2018) New Revision: d262c2ebe808b46b158c165ffcfb670a19e118a4 https://github.com/mroonga/mroonga/commit/d262c2ebe808b46b158c165ffcfb670a19e118a4 Message: mysql8 test: include/have_perfschema.inc doesn't exist Copied files: mysql-test/mroonga/include/mroonga/have_perfschema.inc (from mysql-test/mroonga/wrapper/t/performance_schema.test) Modified files: mysql-test/mroonga/wrapper/t/performance_schema.test Copied: mysql-test/mroonga/include/mroonga/have_perfschema.inc (+11 -23) 52% =================================================================== --- mysql-test/mroonga/wrapper/t/performance_schema.test 2018-07-29 18:21:22 +0900 (9d7f3569) +++ mysql-test/mroonga/include/mroonga/have_perfschema.inc 2018-07-29 18:33:06 +0900 (0f9c147f) @@ -1,4 +1,4 @@ -# Copyright(C) 2012-2015 Kouhei Sutou <kou �� clear-code.com> +# Copyright(C) 2018 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 @@ -14,28 +14,16 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ---source ../../include/mroonga/have_innodb.inc ---source ../../include/mroonga/not_embedded.inc ---source include/have_perfschema.inc ---source ../../include/mroonga/have_mroonga.inc - ---disable_warnings -DROP TABLE IF EXISTS diaries; ---enable_warnings - -SHOW VARIABLES LIKE 'performance_schema'; - -CREATE TABLE diaries ( - id INT PRIMARY KEY AUTO_INCREMENT, - content VARCHAR(255), - FULLTEXT INDEX (content) -) DEFAULT CHARSET UTF8MB4 COMMENT = 'ENGINE "InnoDB"'; -SHOW CREATE TABLE diaries; +--source ../../include/mroonga/check_version.inc +--source ../../include/mroonga/check_mariadb.inc -INSERT INTO diaries (content) VALUES ("Tommorow will be shiny day!"); - -SHOW TABLES FROM performance_schema LIKE 'threads'; +if ($mariadb) { +--source include/have_perfschema.inc +} -DROP TABLE diaries; +if (!$mariadb) { + if (!$version_8_0_or_later) { +--source include/have_perfschema.inc + } +} ---source ../../include/mroonga/have_mroonga_deinit.inc Modified: mysql-test/mroonga/wrapper/t/performance_schema.test (+1 -1) =================================================================== --- mysql-test/mroonga/wrapper/t/performance_schema.test 2018-07-29 18:21:22 +0900 (9d7f3569) +++ mysql-test/mroonga/wrapper/t/performance_schema.test 2018-07-29 18:33:06 +0900 (e14552ec) @@ -16,7 +16,7 @@ --source ../../include/mroonga/have_innodb.inc --source ../../include/mroonga/not_embedded.inc ---source include/have_perfschema.inc +--source ../../include/mroonga/have_perfschema.inc --source ../../include/mroonga/have_mroonga.inc --disable_warnings -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180729/1f6cb762/attachment-0001.htm
