revision-id: aee96bedc6a1e8f90bd2e9ef8e6518ee126f7ff2 (mariadb-10.3.6-276-gaee96bedc6a) parent(s): 639d2eff98daf63926564332126e10feee7e5eaa author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-29 10:11:32 +0200 message: Revert unnecessary changes - Part II --- mysql-test/include/have_ipv6.inc | 20 -------- mysql-test/include/restart_mysqld.inc | 1 + .../suite/galera_3nodes/include/have_ipv6.inc | 7 ++- mysql-test/suite/innodb/t/galera.skip | 53 ---------------------- 4 files changed, 7 insertions(+), 74 deletions(-) diff --git a/mysql-test/include/have_ipv6.inc b/mysql-test/include/have_ipv6.inc deleted file mode 100644 index 752dd0db53e..00000000000 --- a/mysql-test/include/have_ipv6.inc +++ /dev/null @@ -1,20 +0,0 @@ -# Check if ipv6 is available. -# ---disable_query_log ---disable_result_log ---disable_abort_on_error -connect (checkcon123456789,::1,root,,test); -if($mysql_errno) -{ - skip No IPv6 support; -} -connection default; -if(!$mysql_errno) -{ - disconnect checkcon123456789; -} ---enable_abort_on_error ---enable_result_log ---enable_query_log -# end check - diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 8cf2798b592..3d3e55db4ac 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -5,5 +5,6 @@ # --source include/restart_mysqld.inc --source include/not_embedded.inc + --source include/shutdown_mysqld.inc --source include/start_mysqld.inc diff --git a/mysql-test/suite/galera_3nodes/include/have_ipv6.inc b/mysql-test/suite/galera_3nodes/include/have_ipv6.inc index 560cad03350..752dd0db53e 100644 --- a/mysql-test/suite/galera_3nodes/include/have_ipv6.inc +++ b/mysql-test/suite/galera_3nodes/include/have_ipv6.inc @@ -2,13 +2,18 @@ # --disable_query_log --disable_result_log +--disable_abort_on_error connect (checkcon123456789,::1,root,,test); if($mysql_errno) { skip No IPv6 support; } connection default; -disconnect checkcon123456789; +if(!$mysql_errno) +{ + disconnect checkcon123456789; +} +--enable_abort_on_error --enable_result_log --enable_query_log # end check diff --git a/mysql-test/suite/innodb/t/galera.skip b/mysql-test/suite/innodb/t/galera.skip deleted file mode 100644 index 1991ce10cc4..00000000000 --- a/mysql-test/suite/innodb/t/galera.skip +++ /dev/null @@ -1,53 +0,0 @@ -innodb : deadlock, failure in UPDATE IGNORE, lp1372296 -innodb_ctype_ldml : Test contains statements unsafe to replicate in statement-based replication -innodb-autoinc : deadlock, failure in REPLACE, lp1372296 -innodb_mysql : deadlock due to DDL -innodb_buffer_pool_load : Test contains statements unsafe to replicate in statement-based replication -innodb-autoinc-56228 : deadlock, lp1372301 -innodb_lock_wait_timeout_1 : Test contains statements unsafe to replicate in statement-based replication -innodb-consistent : Test contains statements unsafe to replicate in statement-based replication -innodb-semi-consistent : Test contains statements unsafe to replicate in statement-based replication -innodb-index : DDL concurrent with transaction -innodb-lock : deadlock on INSERT IGNORE, lp1372296 -innodb-status-output : Test performs server restart -innodb-wl5522 : Test contains statements unsafe to replicate in statement-based replication -innodb-wl6445 : Test performs server restart -innodb_bug40360 : Test contains statements unsafe to replicate in statement-based replication -innodb_bug40565 : Galera git bug #137 - Invalid deadlock on UPDATE to NULL without a PK -innodb_bug42419 : Test contains statements unsafe to replicate in statement-based replication -innodb_bug49164 : Test contains statements unsafe to replicate in statement-based replication -innodb_bug45357 : impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging -innodb_bug52663 : Test contains statements unsafe to replicate in statement-based replication -innodb_bug59733 : Test contains statements unsafe to replicate in statement-based replication -innodb_gis : Test contains statements unsafe to replicate in statement-based replication -innodb_prefix_index_restart_server : crash, lp1372288 -innodb_stats_external_pages : Test contains statements unsafe to replicate in statement-based replication -innodb-2byte-collation : Unsafe statement written to the binary log -innodb-change-buffer-recovery : Test contains statements unsafe to replicate in statement-based replication -innodb_bug53756 : Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT -innodb-alter-autoinc : AUTO_INCREMENT differences -innodb_bug13635833 : Test contains statements unsafe to replicate in statement-based replication -innodb_bug13867871 : mysql-wsrep#3 - innodb_bug13867871 test fails with wsrep loaded -innodb_bug14006907 : DDL lock wait timeout -innodb_bug38231 : Deadlock on UNLOCK TABLE -innodb_bug-13628249 : mysql-wsrep#12 InnoDB: Failing assertion: !srv_read_only_mode with server restart -innodb-wl6445-1 : mysql-wsrep#12 InnoDB: Failing assertion: !srv_read_only_mode with server restart -innodb-wl6445-2 : mysql-wsrep#12 InnoDB: Failing assertion: !srv_read_only_mode with server restart -innodb_bug12400341 : Test does not account for applier threads when performing SHOW PROCESSLIST -innodb-blob : 'Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging' -innodb_corrupt_bit : 'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.' -innodb-index-online : ALTER succeeds as it is given a higher priority -innodb-table-online : ALTER succeeds as it is given a higher priority -innodb-index-online-purge : ALTER succeeds as it is given a higher priority -innodb-wl5522-debug : Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. -innodb_stats_table_flag_auto_recalc : Performs multiple restarts in a row which causes '1047: Unknown command' errors -innodb-lock-inherit-read_commited : Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT -innodb-index-debug : Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT -flush-hang : Unsafe statement written to the binary log -innodb_deadlock_with_autoinc : Test uses autoinc_lock_mode = 0 -innodb_stats_del_mark : Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. -ibuf_not_empty : InnoDB: Failing assertion: !srv_read_only_mode with server restart -innodb_force_recovery : InnoDB: Failing assertion: !srv_read_only_mode with server restart -innodb-system-table-view : Result depends on whether galera is loaded or not -innodb-wl5980-linux : Fails because portability_wl5980_linux.zip does not contain wsrep_schema -innodb-multiple-tablespaces : No changes to SR table are allowed if innodb-force-recovery > 0 \ No newline at end of file