From f0c52bfe3bc0ffe4063e0572dd2cfd7148cf955e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 21 Apr 2022 17:18:41 +1000 Subject: [PATCH] MDEV-28263: mariadb-tzinfo-to-sql (postfix) I missed include/no_protocol.inc already existed. --- mysql-test/include/not_psprotocol.inc | 14 -------------- mysql-test/main/mysql_tzinfo_to_sql_symlink.test | 2 +- .../suite/galera/t/mariadb_tzinfo_to_sql.test | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 mysql-test/include/not_psprotocol.inc diff --git a/mysql-test/include/not_psprotocol.inc b/mysql-test/include/not_psprotocol.inc deleted file mode 100644 index 21601cf6310..00000000000 --- a/mysql-test/include/not_psprotocol.inc +++ /dev/null @@ -1,14 +0,0 @@ -# Disable in mtr --ps-protocol ---disable_abort_on_error ---disable_result_log ---disable_query_log -/*M!100202 execute immediate 'select 1' */; ---enable_query_log ---enable_result_log ---enable_abort_on_error -let $error = $mysql_errno; -# ER_UNSUPPORTED_PS -if ($error == 1295) -{ ---skip Test is not supported in the prepared statement protocol yet -} diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test index 2b9c22b7e58..a2ce9e8f9b9 100644 --- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test +++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test @@ -1,7 +1,7 @@ --source include/have_innodb.inc --source include/have_symlink.inc --source include/not_windows.inc ---source include/not_psprotocol.inc +--source include/no_protocol.inc CREATE TABLE time_zone LIKE mysql.time_zone; CREATE TABLE time_zone_name LIKE mysql.time_zone_name; diff --git a/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.test b/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.test index 7fd454651e9..eb5febb127a 100644 --- a/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.test +++ b/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.test @@ -1,6 +1,6 @@ --source include/galera_cluster.inc --source include/have_innodb.inc ---source include/not_psprotocol.inc +--source include/no_protocol.inc --echo # --echo # MDEV-28263: mariadb-tzinfo-to-sql improve wsrep and binlog cases