1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

MDEV-28263: mariadb-tzinfo-to-sql (postfix)

I missed include/no_protocol.inc already existed.
This commit is contained in:
Daniel Black
2022-04-21 17:18:41 +10:00
parent c47069ead7
commit f0c52bfe3b
3 changed files with 2 additions and 16 deletions

View File

@ -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
}

View File

@ -1,7 +1,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_symlink.inc --source include/have_symlink.inc
--source include/not_windows.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 LIKE mysql.time_zone;
CREATE TABLE time_zone_name LIKE mysql.time_zone_name; CREATE TABLE time_zone_name LIKE mysql.time_zone_name;

View File

@ -1,6 +1,6 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_psprotocol.inc --source include/no_protocol.inc
--echo # --echo #
--echo # MDEV-28263: mariadb-tzinfo-to-sql improve wsrep and binlog cases --echo # MDEV-28263: mariadb-tzinfo-to-sql improve wsrep and binlog cases