Kouhei Sutou
null+****@clear*****
Wed Feb 8 17:46:57 JST 2017
Kouhei Sutou 2017-02-08 17:46:57 +0900 (Wed, 08 Feb 2017) New Revision: 8c677e9fe25adcac4c7aabe6ee2ead864a035f1c https://github.com/mroonga/mroonga/commit/8c677e9fe25adcac4c7aabe6ee2ead864a035f1c Message: maraidb10.2.3 test: follow CURRENT_TIME format change since MariaDB 10.2.3 Modified files: mysql-test/mroonga/storage/create/table/t/TODO_SPLIT_ME.test mysql-test/mroonga/wrapper/create/table/t/TODO_SPLIT_ME.test mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_primary_key_myisam.test mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_unique_index_myisam.test Modified: mysql-test/mroonga/storage/create/table/t/TODO_SPLIT_ME.test (+2 -0) =================================================================== --- mysql-test/mroonga/storage/create/table/t/TODO_SPLIT_ME.test 2017-02-08 10:03:47 +0900 (4ca11ab) +++ mysql-test/mroonga/storage/create/table/t/TODO_SPLIT_ME.test 2017-02-08 17:46:57 +0900 (53a3506) @@ -64,6 +64,8 @@ create table t1 (c1 time); desc t1; drop table t1; create table t1 (c1 timestamp); +# For MariaDB 10.2.3 +-- replace_result current_timestamp() CURRENT_TIMESTAMP desc t1; drop table t1; create table t1 (c1 datetime); Modified: mysql-test/mroonga/wrapper/create/table/t/TODO_SPLIT_ME.test (+2 -0) =================================================================== --- mysql-test/mroonga/wrapper/create/table/t/TODO_SPLIT_ME.test 2017-02-08 10:03:47 +0900 (0217128) +++ mysql-test/mroonga/wrapper/create/table/t/TODO_SPLIT_ME.test 2017-02-08 17:46:57 +0900 (a96d4af) @@ -65,6 +65,8 @@ create table t1 (c1 time primary key) COMMENT = 'engine "innodb"'; desc t1; drop table t1; create table t1 (c1 timestamp primary key) COMMENT = 'engine "innodb"'; +# For MariaDB 10.2.3 +-- replace_result current_timestamp() CURRENT_TIMESTAMP desc t1; drop table t1; create table t1 (c1 datetime primary key) COMMENT = 'engine "innodb"'; Modified: mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_primary_key_myisam.test (+2 -0) =================================================================== --- mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_primary_key_myisam.test 2017-02-08 10:03:47 +0900 (df50d0c) +++ mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_primary_key_myisam.test 2017-02-08 17:46:57 +0900 (e9afd07) @@ -26,6 +26,8 @@ CREATE TABLE diaries ( content TEXT NOT NULL, PRIMARY KEY (date, title) ) DEFAULT CHARSET=UTF8 COMMENT='ENGINE "MyISAM"'; +# For MariaDB 10.2.3 +-- replace_result current_timestamp() CURRENT_TIMESTAMP SHOW CREATE TABLE diaries; INSERT INTO diaries (date, title, content) Modified: mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_unique_index_myisam.test (+2 -0) =================================================================== --- mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_unique_index_myisam.test 2017-02-08 10:03:47 +0900 (7e0491a) +++ mysql-test/mroonga/wrapper/insert/on_duplicate_key_update/t/multiple_column_unique_index_myisam.test 2017-02-08 17:46:57 +0900 (3cf75bb) @@ -27,6 +27,8 @@ CREATE TABLE diaries ( content TEXT NOT NULL, UNIQUE INDEX (date, title) ) DEFAULT CHARSET=UTF8 COMMENT='ENGINE "MyISAM"'; +# For MariaDB 10.2.3 +-- replace_result current_timestamp() CURRENT_TIMESTAMP SHOW CREATE TABLE diaries; INSERT INTO diaries (date, title, content) -------------- next part -------------- HTML����������������������������...Download