diff options
Diffstat (limited to 'mysql-test/suite')
56 files changed, 812 insertions, 197 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result index eb96f7bb984..9f998e049c0 100644 --- a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result +++ b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result @@ -29,3 +29,82 @@ master-bin.000001 # Query # # XA END X'33',X'',1 master-bin.000001 # XA_prepare # # XA PREPARE X'33',X'',1 master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # XA ROLLBACK X'33',X'',1 +RESET MASTER; +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1),(2); +INSERT INTO t2 VALUES (1),(2); +XA START '1'; +REPLACE INTO t1 SELECT * FROM t1; +REPLACE INTO t2 SELECT * FROM t2; +XA END '1'; +XA PREPARE '1'; +XA ROLLBACK '1'; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +DROP TABLE t1, t2; +# Proof of correct logging incl empty XA-PREPARE +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT) ENGINE=MyISAM +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1),(2) +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO t2 VALUES (1),(2) +master-bin.000001 # Xid # # COMMIT /* XID */ +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Annotate_rows # # REPLACE INTO t1 SELECT * FROM t1 +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # XA START X'31',X'',1 GTID #-#-# +master-bin.000001 # Query # # XA END X'31',X'',1 +master-bin.000001 # XA_prepare # # XA PREPARE X'31',X'',1 +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # XA ROLLBACK X'31',X'',1 +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t1`,`t2` /* generated by server */ +RESET MASTER; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +CREATE SEQUENCE s ENGINE=InnoDB; +XA START '2'; +SELECT NEXT VALUE FOR s; +NEXT VALUE FOR s +1 +REPLACE INTO t1 SELECT * FROM t1; +XA END '2'; +XA PREPARE '2'; +XA ROLLBACK '2'; +DROP SEQUENCE s; +DROP TABLE t1; +# Proof of correct logging incl empty XA-PREPARE +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Annotate_rows # # INSERT INTO t1 VALUES (1) +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Xid # # COMMIT /* XID */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; CREATE SEQUENCE s ENGINE=InnoDB +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Annotate_rows # # SELECT NEXT VALUE FOR s +master-bin.000001 # Table_map # # table_id: # (test.s) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Gtid # # XA START X'32',X'',1 GTID #-#-# +master-bin.000001 # Query # # XA END X'32',X'',1 +master-bin.000001 # XA_prepare # # XA PREPARE X'32',X'',1 +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # XA ROLLBACK X'32',X'',1 +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP SEQUENCE `s` /* generated by server */ +master-bin.000001 # Gtid # # GTID #-#-# +master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index f643c5a9c35..4c353bf6abb 100644 --- a/mysql-test/suite/binlog/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -50,7 +50,7 @@ reset master; flush logs; SET SESSION debug_dbug="+d,crash_purge_before_update_index"; purge binary logs TO 'master-bin.000002'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -62,7 +62,7 @@ master-bin.000003 flush logs; SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; purge binary logs TO 'master-bin.000004'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -73,7 +73,7 @@ master-bin.000005 flush logs; SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; purge binary logs TO 'master-bin.000006'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -83,7 +83,7 @@ master-bin.000007 # crash_create_non_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -94,7 +94,7 @@ master-bin.000008 # crash_create_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -106,7 +106,7 @@ master-bin.000009 # crash_create_after_update_index SET SESSION debug_dbug="+d,crash_create_after_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index diff --git a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result index d6875ab60e0..a4cd5b4080d 100644 --- a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result +++ b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result @@ -50,3 +50,4 @@ a 400 401 drop table t1; +reset master; diff --git a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test index 7f923f71f81..443feb60627 100644 --- a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test +++ b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test @@ -33,3 +33,50 @@ XA ROLLBACK '3'; --echo # Proof of correct logging incl empty XA-PREPARE --source include/show_binlog_events.inc + +# The test verifies execution and binary logging of user XA that produce empty +# XA-PREPARE group of events. +# +# MDEV-22757 Assertion `!binlog || exist_hton_without_prepare' +# in MYSQL_BIN_LOG::unlog_xa_prepare + +RESET MASTER; +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1),(2); +INSERT INTO t2 VALUES (1),(2); + +XA START '1'; +REPLACE INTO t1 SELECT * FROM t1; +REPLACE INTO t2 SELECT * FROM t2; +XA END '1'; +XA PREPARE '1'; + +# Cleanup +XA ROLLBACK '1'; +DROP TABLE t1, t2; + +--echo # Proof of correct logging incl empty XA-PREPARE +--source include/show_binlog_events.inc + + +# MDEV-22430 Assertion ... in MYSQL_BIN_LOG::unlog_xa_prepare + +RESET MASTER; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +CREATE SEQUENCE s ENGINE=InnoDB; + +XA START '2'; +SELECT NEXT VALUE FOR s; +REPLACE INTO t1 SELECT * FROM t1; +XA END '2'; +XA PREPARE '2'; + +# Cleanup +XA ROLLBACK '2'; +DROP SEQUENCE s; +DROP TABLE t1; + +--echo # Proof of correct logging incl empty XA-PREPARE +--source include/show_binlog_events.inc diff --git a/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test b/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test index b2af560fa50..9145afc047f 100644 --- a/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test +++ b/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test @@ -10,3 +10,4 @@ disable_query_log; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); enable_query_log; -- source include/binlog_insert_delayed.test +reset master; diff --git a/mysql-test/suite/binlog_encryption/binlog_index.result b/mysql-test/suite/binlog_encryption/binlog_index.result index f643c5a9c35..4c353bf6abb 100644 --- a/mysql-test/suite/binlog_encryption/binlog_index.result +++ b/mysql-test/suite/binlog_encryption/binlog_index.result @@ -50,7 +50,7 @@ reset master; flush logs; SET SESSION debug_dbug="+d,crash_purge_before_update_index"; purge binary logs TO 'master-bin.000002'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -62,7 +62,7 @@ master-bin.000003 flush logs; SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; purge binary logs TO 'master-bin.000004'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -73,7 +73,7 @@ master-bin.000005 flush logs; SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; purge binary logs TO 'master-bin.000006'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -83,7 +83,7 @@ master-bin.000007 # crash_create_non_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -94,7 +94,7 @@ master-bin.000008 # crash_create_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -106,7 +106,7 @@ master-bin.000009 # crash_create_after_update_index SET SESSION debug_dbug="+d,crash_create_after_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index diff --git a/mysql-test/suite/binlog_encryption/rpl_sync.result b/mysql-test/suite/binlog_encryption/rpl_sync.result index 1240c446164..5fa3a07a4e7 100644 --- a/mysql-test/suite/binlog_encryption/rpl_sync.result +++ b/mysql-test/suite/binlog_encryption/rpl_sync.result @@ -22,7 +22,7 @@ connection slave; include/stop_slave_io.inc SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc @@ -40,7 +40,7 @@ insert into t1(a) values(9); connection slave; SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc diff --git a/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result b/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result index a0a45446eff..faa85126f03 100644 --- a/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result +++ b/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result @@ -99,19 +99,19 @@ Killing server ... connection node_1; Killing server ... connection node_1_insert_simple; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_insert_multi; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_insert_transaction; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_update_simple; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_insert_1k; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_insert_1m; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1_insert_10m; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1; Performing --wsrep-recover ... Using --wsrep-start-position when starting mysqld ... diff --git a/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result b/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result index b3096afd387..88cc444106b 100644 --- a/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result +++ b/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result @@ -22,12 +22,14 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 3; COUNT(*) = 1 1 DROP TABLE t1; +connection node_1; START TRANSACTION; SET SESSION wsrep_on=OFF; ERROR 25000: You are not allowed to execute this command in a transaction SET GLOBAL wsrep_on=OFF; ERROR 25000: You are not allowed to execute this command in a transaction COMMIT; +connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); START TRANSACTION; INSERT INTO t1 VALUES (1); @@ -68,3 +70,58 @@ SET GLOBAL wsrep_on = ON; SHOW SESSION VARIABLES LIKE 'wsrep_on'; Variable_name Value wsrep_on ON +disconnect node_1b; +connection node_1; +SET GLOBAL wsrep_on = OFF; +SET SESSION wsrep_on = ON; +ERROR HY000: Can't enable @@session.wsrep_on, while @@global.wsrep_on is disabled +SET GLOBAL wsrep_on = ON; +SET SESSION wsrep_on = ON; +connection node_1; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +SET GLOBAL wsrep_on = OFF; +connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;; +connection node_1b; +SHOW SESSION VARIABLES LIKE 'wsrep_on'; +Variable_name Value +wsrep_on OFF +SHOW GLOBAL VARIABLES LIKE 'wsrep_on'; +Variable_name Value +wsrep_on OFF +SET GLOBAL wsrep_on = ON; +START TRANSACTION; +INSERT INTO t1 VALUES(1); +COMMIT; +SELECT * FROM t1; +f1 +1 +connection node_2; +SELECT * FROM t1; +f1 +1 +DROP TABLE t1; +connection node_1; +SET SESSION wsrep_on = OFF; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +INSERT INTO t1 VALUES (1); +START TRANSACTION; +INSERT INTO t1 VALUES (2); +COMMIT; +DROP TABLE t1; +connection node_2; +SHOW TABLES; +Tables_in_test +connection node_1; +SET SESSION wsrep_on = ON; +SET GLOBAL wsrep_on = OFF; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +INSERT INTO t1 VALUES (1); +START TRANSACTION; +INSERT INTO t1 VALUES (2); +COMMIT; +connection node_2; +SHOW TABLES; +Tables_in_test +connection node_1; +DROP TABLE t1; +SET GLOBAL wsrep_on = ON; diff --git a/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test b/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test index 1a48abc25eb..10517f877ae 100644 --- a/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test +++ b/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test @@ -36,6 +36,7 @@ DROP TABLE t1; # active transaction. # +--connection node_1 START TRANSACTION; --error ER_CANT_DO_THIS_DURING_AN_TRANSACTION SET SESSION wsrep_on=OFF; @@ -49,6 +50,7 @@ COMMIT; # @@session.wsrep_on of current sessions # +--connection node_1 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); START TRANSACTION; INSERT INTO t1 VALUES (1); @@ -75,6 +77,7 @@ DROP TABLE t1; # # New connections inherit @@session.wsrep_on from @@global.wsrep_on # + --connection node_1 SET GLOBAL wsrep_on = OFF; @@ -87,3 +90,78 @@ DROP TABLE t2; SET GLOBAL wsrep_on = ON; SHOW SESSION VARIABLES LIKE 'wsrep_on'; + +--disconnect node_1b + + +# +# Can't set @@session.wsrep_on = ON, while @@global.wsrep_on = OFF +# + +--connection node_1 +SET GLOBAL wsrep_on = OFF; +--error ER_WRONG_ARGUMENTS +SET SESSION wsrep_on = ON; + +SET GLOBAL wsrep_on = ON; +SET SESSION wsrep_on = ON; + + +# +# @@global.wsrep_on = OFF followed by @@global.wsrep_on = ON +# in a new connection +# + +--connection node_1 +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +SET GLOBAL wsrep_on = OFF; +--connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1; +--connection node_1b +SHOW SESSION VARIABLES LIKE 'wsrep_on'; +SHOW GLOBAL VARIABLES LIKE 'wsrep_on'; +SET GLOBAL wsrep_on = ON; +START TRANSACTION; +INSERT INTO t1 VALUES(1); +COMMIT; + +SELECT * FROM t1; + +--connection node_2 +SELECT * FROM t1; + +DROP TABLE t1; + + +# +# Test single statement, multi statement, and +# TOI tansactions while @@session.wsrep_on = OFF +# and then same @@global.wsrep_on = OFF. +# Notice, the combination @@global.wsrep_on = OFF +# and @@session.wsrep_on = ON is not not possible, +# (as tested above in this test case) +# + +--connection node_1 +SET SESSION wsrep_on = OFF; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +INSERT INTO t1 VALUES (1); +START TRANSACTION; +INSERT INTO t1 VALUES (2); +COMMIT; +DROP TABLE t1; +--connection node_2 +SHOW TABLES; +--connection node_1 +SET SESSION wsrep_on = ON; + +SET GLOBAL wsrep_on = OFF; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); +INSERT INTO t1 VALUES (1); +START TRANSACTION; +INSERT INTO t1 VALUES (2); +COMMIT; +--connection node_2 +SHOW TABLES; +--connection node_1 +DROP TABLE t1; +SET GLOBAL wsrep_on = ON; diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index f69efbde076..2ab0886a427 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -17,8 +17,8 @@ galera_ipv6_mariabackup_section : MDEV-22195: galera_3nodes.galera_ipv6_mariabac galera_ipv6_mysqldump : MDEV-24036: galera_3nodes.galera_ipv6_mysqldump: rare random crashes during shutdown galera_ipv6_rsync_section : MDEV-23580: galera_3nodes.galera_ipv6_rsync_section MTR failed: WSREP_SST: [ERROR] rsync daemon port '16008' has been taken galera_ist_gcache_rollover : MDEV-23578 WSREP: exception caused by message: {v=0,t=1,ut=255,o=4,s=0,sr=0,as=1,f=6,src=50524cfe,srcvid=view_id(REG,50524cfe,4),insvid=view_id(UNKNOWN,00000000,0),ru=00000000,r=[-1,-1],fs=75,nl=(} -galera_load_data_ist : MDEV-24639 galera_3nodes.galera_load_data_ist MTR failed with SIGABRT: query 'reap' failed: 2013: Lost connection to MySQL server during query -galera_load_data_ist : MDEV-24639 galera_3nodes.galera_load_data_ist MTR failed with SIGABRT: query 'reap' failed: 2013: Lost connection to MySQL server during query +galera_load_data_ist : MDEV-24639 galera_3nodes.galera_load_data_ist MTR failed with SIGABRT: query 'reap' failed: 2013: Lost connection to server during query +galera_load_data_ist : MDEV-24639 galera_3nodes.galera_load_data_ist MTR failed with SIGABRT: query 'reap' failed: 2013: Lost connection to server during query galera_pc_bootstrap : MDEV-24650 galera_pc_bootstrap MTR failed: Could not execute 'check-testcase' before testcase galera_safe_to_bootstrap : MDEV-24097 galera_3nodes.galera_safe_to_bootstrap MTR sporadaically fails: Failed to start mysqld or mysql_shutdown failed galera_slave_options_do : MDEV-8798 diff --git a/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result b/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result new file mode 100644 index 00000000000..541822797b7 --- /dev/null +++ b/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result @@ -0,0 +1,15 @@ +connection node_2; +connection node_1; +connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connection node_1; +connection node_2; +connection node_3; +connection node_1; +connection node_2; +connection node_2; +# restart: with restart_parameters +SET GLOBAL wsrep_provider_options = 'socket.ssl_reload=1'; +connection node_3; +# restart: with restart_parameters +connection node_2; +FLUSH SSL; diff --git a/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.cnf b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.cnf new file mode 100644 index 00000000000..65d1599268d --- /dev/null +++ b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.cnf @@ -0,0 +1,10 @@ +!include ../galera_3nodes.cnf + +[mysqld.1] +wsrep_provider_options='base_port=@mysqld.1.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key' + +[mysqld.2] +wsrep_provider_options='base_port=@mysqld.2.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key' + +[mysqld.3] +wsrep_provider_options='base_port=@mysqld.3.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key' diff --git a/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test new file mode 100644 index 00000000000..0c22a58b3e9 --- /dev/null +++ b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test @@ -0,0 +1,67 @@ +# +# Test reloading of Galera SSL certificate without shutting down node +# + +--source include/galera_cluster.inc +--source include/have_innodb.inc + +--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 + +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--let $node_3=node_3 +--source ../galera/include/auto_increment_offset_save.inc + +# Setup galera ports +--connection node_1 +--source suite/galera/include/galera_base_port.inc +--let $NODE_GALERAPORT_1 = $_NODE_GALERAPORT + +--connection node_2 +--source suite/galera/include/galera_base_port.inc +--let $NODE_GALERAPORT_2 = $_NODE_GALERAPORT + +# Setup temporary file for SSL reloading +let $ssl_cert = $MYSQLTEST_VARDIR/tmp/ssl_cert.pem; +let $ssl_key = $MYSQLTEST_VARDIR/tmp/ssl_key.pem; +let $ssl_ca = $MYSQLTEST_VARDIR/tmp/ssl_ca.pem; + +copy_file std_data/galera_certs/galera.root.crt $ssl_ca; +copy_file std_data/galera_certs/galera.1.crt $ssl_cert; +copy_file std_data/galera_certs/galera.1.key $ssl_key; + +--connection node_2 +--source include/shutdown_mysqld.inc +--let $restart_noprint=1 +--let $restart_parameters = --wsrep_cluster_address=gcomm://127.0.0.1:$NODE_GALERAPORT_1 --wsrep_provider_options=base_port=$NODE_GALERAPORT_2;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=$MYSQLTEST_VARDIR/tmp/ssl_cert.pem;socket.ssl_key=$MYSQLTEST_VARDIR/tmp/ssl_key.pem +--source include/start_mysqld.inc +--source include/galera_wait_ready.inc + +# Set certificate and key and reload by setting directly `wsrep_provider_options` +remove_file $ssl_cert; +remove_file $ssl_key; +copy_file std_data/galera_certs/galera.2.crt $ssl_cert; +copy_file std_data/galera_certs/galera.2.key $ssl_key; +SET GLOBAL wsrep_provider_options = 'socket.ssl_reload=1'; + +--connection node_3 +--source include/shutdown_mysqld.inc +--let $restart_parameters = --wsrep_cluster_address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 +--source include/start_mysqld.inc + +# Set certificate and key and reload by executing `FLUSH SSL` +--connection node_2 +remove_file $ssl_cert; +remove_file $ssl_key; +copy_file std_data/galera_certs/galera.1.crt $ssl_cert; +copy_file std_data/galera_certs/galera.1.key $ssl_key; +FLUSH SSL; + +# Cleanup +remove_file $ssl_ca; +remove_file $ssl_cert; +remove_file $ssl_key; + +# Restore original auto_increment_offset values. +--source ../galera/include/auto_increment_offset_restore.inc diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result index 8333fff98db..726f70145f1 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result +++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result @@ -12,7 +12,7 @@ SET SESSION wsrep_trx_fragment_size=1; START TRANSACTION; INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'); COMMIT; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # restart connection node_1; SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; diff --git a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result index 9e223414fe4..1f874acadec 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result @@ -27,7 +27,7 @@ SET GLOBAL wsrep_cluster_address = ''; SET SESSION wsrep_sync_wait = DEFAULT; connection node_2; INSERT INTO t1 VALUES (6); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection node_1; SELECT COUNT(*) FROM mysql.wsrep_streaming_log; COUNT(*) diff --git a/mysql-test/suite/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result index bf593c6acca..8cfeb7093ca 100644 --- a/mysql-test/suite/innodb/r/alter_crash.result +++ b/mysql-test/suite/innodb/r/alter_crash.result @@ -46,7 +46,7 @@ CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb; INSERT INTO t1 VALUES (1,2),(3,4); SET DEBUG_DBUG='+d,innodb_alter_commit_crash_after_commit'; ALTER TABLE t1 ADD PRIMARY KEY (f2, f1); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart mysqld after the crash and reconnect. # restart SELECT * FROM information_schema.innodb_sys_tables @@ -86,7 +86,7 @@ CREATE TABLE t2 (f1 int not null, f2 int not null) ENGINE=InnoDB; INSERT INTO t2 VALUES (1,2),(3,4); SET DEBUG_DBUG='+d,innodb_alter_commit_crash_before_commit'; ALTER TABLE t2 ADD PRIMARY KEY (f2, f1); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Startup the server after the crash # restart SELECT * FROM information_schema.innodb_sys_tables @@ -125,7 +125,7 @@ ENGINE=InnoDB; INSERT INTO t1 SET a=1,c=2; SET DEBUG_DBUG='+d,innodb_alter_commit_crash_after_commit'; ALTER TABLE t1 ADD INDEX (b), CHANGE c d int, ALGORITHM=INPLACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart mysqld after the crash and reconnect. # restart SELECT * FROM information_schema.innodb_sys_tables diff --git a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result index cfc99650db6..9c698d9dab4 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result +++ b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result @@ -7,7 +7,7 @@ CREATE TABLE t1 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=innodb; SET debug_dbug='+d,innodb_alter_commit_crash_before_commit'; ALTER TABLE t1 ADD PRIMARY KEY (f2, f1); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # restart show create table t1; Table Create Table diff --git a/mysql-test/suite/innodb/r/innodb-blob.result b/mysql-test/suite/innodb/r/innodb-blob.result index fdfbfe3e683..8173d30e92c 100644 --- a/mysql-test/suite/innodb/r/innodb-blob.result +++ b/mysql-test/suite/innodb/r/innodb-blob.result @@ -47,7 +47,7 @@ INSERT INTO t2 VALUES (42); disconnect con1; disconnect con2; connection default; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK @@ -107,7 +107,7 @@ connection con2; # restart disconnect con2; connection default; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query CHECK TABLE t1,t2,t3; Table Op Msg_type Msg_text test.t1 check status OK @@ -139,7 +139,7 @@ UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2 # restart disconnect con2; connection default; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query CHECK TABLE t1,t2,t3; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result b/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result index 678c8c67be5..e3037847441 100644 --- a/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result +++ b/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result @@ -26,7 +26,7 @@ DELETE FROM t1 WHERE a=1; INSERT INTO t1 VALUES(1,'X',1); SET DEBUG_DBUG='+d,crash_after_log_ibuf_upd_inplace'; SELECT b FROM t1 LIMIT 3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query disconnect con1; connection default; FOUND 1 /Wrote log record for ibuf update in place operation/ in mysqld.1.err diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result index 1030fbd0502..91b732ee2a3 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result @@ -15,14 +15,14 @@ CREATE TABLE t1 (c1 INT) ENGINE = InnoDB; INSERT INTO t1 VALUES(1),(2),(3); SET SESSION debug_dbug="+d,ib_discard_before_commit_crash"; ALTER TABLE t1 DISCARD TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query DROP TABLE t1; SET GLOBAL innodb_file_per_table = 1; CREATE TABLE t1 (c1 INT) ENGINE = InnoDB; INSERT INTO t1 VALUES(1),(2),(3); SET SESSION debug_dbug="+d,ib_discard_after_commit_crash"; ALTER TABLE t1 DISCARD TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query DROP TABLE t1; SET GLOBAL innodb_file_per_table = 1; CREATE TABLE t1 (c1 INT) ENGINE = Innodb; @@ -41,12 +41,12 @@ SELECT * FROM t1; ERROR HY000: Tablespace has been discarded for table `t1` SET SESSION debug_dbug="+d,ib_import_before_commit_crash"; ALTER TABLE t1 IMPORT TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SELECT COUNT(*) FROM t1; ERROR HY000: Tablespace has been discarded for table `t1` SET SESSION debug_dbug="+d,ib_import_before_checkpoint_crash"; ALTER TABLE t1 IMPORT TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query unlink: t1.ibd unlink: t1.cfg DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/redo_log_during_checkpoint.result b/mysql-test/suite/innodb/r/redo_log_during_checkpoint.result index c7b4bb4403b..e95ca52b173 100644 --- a/mysql-test/suite/innodb/r/redo_log_during_checkpoint.result +++ b/mysql-test/suite/innodb/r/redo_log_during_checkpoint.result @@ -7,7 +7,7 @@ USE very_long_database_name; SET debug_dbug = '+d,increase_mtr_checkpoint_size'; SET debug_dbug = '+d,crash_after_checkpoint'; set global innodb_log_checkpoint_now = 1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Skip MLOG_FILE_NAME redo records during recovery DROP DATABASE very_long_database_name; SET GLOBAL innodb_flush_sync=OFF; @@ -21,6 +21,6 @@ CREATE DATABASE very_long_database_name; USE very_long_database_name; SET debug_dbug = '+d,crash_after_checkpoint'; set global innodb_log_checkpoint_now = 1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Skip MLOG_FILE_NAME redo records during recovery DROP DATABASE very_long_database_name; diff --git a/mysql-test/suite/innodb/r/temporary_table.result b/mysql-test/suite/innodb/r/temporary_table.result index 732f369c402..37e0eac9ce5 100644 --- a/mysql-test/suite/innodb/r/temporary_table.result +++ b/mysql-test/suite/innodb/r/temporary_table.result @@ -678,3 +678,99 @@ SET FOREIGN_KEY_CHECKS = 0; CREATE TEMPORARY TABLE t1(f1 INT NOT NULL, FOREIGN KEY(f1) REFERENCES t0(f1))ENGINE=InnoDB; ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed") +CREATE TABLE t (c INT) ENGINE=InnoDB; +INSERT INTO t VALUES(0); +CREATE TEMPORARY TABLE t2 (c INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +INSERT INTO t2 SELECT * FROM t; +COMMIT; +DROP TABLE t, t2; +CREATE TEMPORARY TABLE t (c INT,c2 INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +INSERT INTO t VALUES(0); +ERROR 21S01: Column count doesn't match value count at row 1 +SAVEPOINT s; +INSERT INTO t VALUES(0,0); +COMMIT; +DROP TABLE t; +CREATE TEMPORARY TABLE t (c INT,c2 INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +INSERT INTO t VALUES(0); +ERROR 21S01: Column count doesn't match value count at row 1 +SAVEPOINT s; +INSERT INTO t VALUES(0,0); +ROLLBACK; +DROP TABLE t; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +COMMIT; +DROP TABLE t1; +CREATE TEMPORARY TABLE t(c INT) ENGINE=InnoDB; +SET SESSION tx_read_only=TRUE; +LOCK TABLE test.t READ; +SELECT * FROM t; +c +INSERT INTO t VALUES(0xADC3); +SET SESSION tx_read_only=FALSE; +DROP TABLE t; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +COMMIT; +DROP TABLE t1; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY, b int) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1, 1); +START TRANSACTION READ ONLY; +UPDATE t1 SET b= 2; +COMMIT; +DROP TABLE t1; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY, b int, c varchar(255)) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1, 1, repeat('a', 200)); +START TRANSACTION READ ONLY; +UPDATE t1 SET b= 2, c=repeat('a', 250); +COMMIT; +DROP TABLE t1; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +ROLLBACK; +DROP TABLE t1; +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +DELETE FROM t1 WHERE a= 2; +COMMIT; +DROP TABLE t1; +CREATE TEMPORARY TABLE tmp (a INT) ENGINE=InnoDB; +INSERT INTO tmp () VALUES (),(); +SET TX_READ_ONLY= 1; +INSERT INTO tmp SELECT * FROM tmp; +SET TX_READ_ONLY= 0; +DROP TABLE tmp; +SET sql_mode=''; +SET GLOBAL tx_read_only=TRUE; +CREATE TEMPORARY TABLE t (c INT); +SET SESSION tx_read_only=DEFAULT; +INSERT INTO t VALUES(1); +INSERT INTO t SELECT * FROM t; +SET SESSION tx_read_only=FALSE; +SET GLOBAL tx_read_only=OFF; +DROP TABLE t; +CREATE TEMPORARY TABLE t(a INT); +SET SESSION tx_read_only=ON; +LOCK TABLE t READ; +SELECT COUNT(*)FROM t; +COUNT(*) +0 +INSERT INTO t VALUES (0); +SET SESSION tx_read_only=OFF; +DROP TABLE t; +CREATE TEMPORARY TABLE t (a INT) ENGINE=InnoDB; +INSERT INTO t VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t SET a = NULL; +ROLLBACK; diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index f5006c82549..7d63f74c2ea 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -502,3 +502,110 @@ SET FOREIGN_KEY_CHECKS = 0; --error ER_CANT_CREATE_TABLE CREATE TEMPORARY TABLE t1(f1 INT NOT NULL, FOREIGN KEY(f1) REFERENCES t0(f1))ENGINE=InnoDB; + +CREATE TABLE t (c INT) ENGINE=InnoDB; +INSERT INTO t VALUES(0); +CREATE TEMPORARY TABLE t2 (c INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +INSERT INTO t2 SELECT * FROM t; +COMMIT; +DROP TABLE t, t2; + +CREATE TEMPORARY TABLE t (c INT,c2 INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +--error ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO t VALUES(0); +SAVEPOINT s; +INSERT INTO t VALUES(0,0); +COMMIT; +DROP TABLE t; + +CREATE TEMPORARY TABLE t (c INT,c2 INT) ENGINE=InnoDB; +START TRANSACTION READ ONLY; +--error ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO t VALUES(0); +SAVEPOINT s; +INSERT INTO t VALUES(0,0); +ROLLBACK; +DROP TABLE t; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +COMMIT; +DROP TABLE t1; + +CREATE TEMPORARY TABLE t(c INT) ENGINE=InnoDB; +SET SESSION tx_read_only=TRUE; +LOCK TABLE test.t READ; +SELECT * FROM t; +INSERT INTO t VALUES(0xADC3); +SET SESSION tx_read_only=FALSE; +DROP TABLE t; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +COMMIT; +DROP TABLE t1; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY, b int) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1, 1); +START TRANSACTION READ ONLY; +UPDATE t1 SET b= 2; +COMMIT; +DROP TABLE t1; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY, b int, c varchar(255)) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1, 1, repeat('a', 200)); +START TRANSACTION READ ONLY; +UPDATE t1 SET b= 2, c=repeat('a', 250); +COMMIT; +DROP TABLE t1; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t1 SET a= 2; +ROLLBACK; +DROP TABLE t1; + +CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +START TRANSACTION READ ONLY; +DELETE FROM t1 WHERE a= 2; +COMMIT; +DROP TABLE t1; + +CREATE TEMPORARY TABLE tmp (a INT) ENGINE=InnoDB; +INSERT INTO tmp () VALUES (),(); +SET TX_READ_ONLY= 1; +INSERT INTO tmp SELECT * FROM tmp; +SET TX_READ_ONLY= 0; +DROP TABLE tmp; + +SET sql_mode=''; +SET GLOBAL tx_read_only=TRUE; +CREATE TEMPORARY TABLE t (c INT); +SET SESSION tx_read_only=DEFAULT; +INSERT INTO t VALUES(1); +INSERT INTO t SELECT * FROM t; +SET SESSION tx_read_only=FALSE; +SET GLOBAL tx_read_only=OFF; +DROP TABLE t; + +CREATE TEMPORARY TABLE t(a INT); +SET SESSION tx_read_only=ON; +LOCK TABLE t READ; +SELECT COUNT(*)FROM t; +INSERT INTO t VALUES (0); +SET SESSION tx_read_only=OFF; +DROP TABLE t; + +CREATE TEMPORARY TABLE t (a INT) ENGINE=InnoDB; +INSERT INTO t VALUES (1); +START TRANSACTION READ ONLY; +UPDATE t SET a = NULL; +ROLLBACK; diff --git a/mysql-test/suite/innodb_fts/r/sync.result b/mysql-test/suite/innodb_fts/r/sync.result index 5b8e4810028..92cb3a748e4 100644 --- a/mysql-test/suite/innodb_fts/r/sync.result +++ b/mysql-test/suite/innodb_fts/r/sync.result @@ -97,7 +97,7 @@ FULLTEXT(title) INSERT INTO t1(title) VALUES('database'); SET debug_dbug = '+d,fts_instrument_sync_debug,fts_write_node_crash'; INSERT INTO t1(title) VALUES('mysql'); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # restart After restart SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result index 8688690b66a..0d2b9c7cf2c 100644 --- a/mysql-test/suite/innodb_gis/r/rollback.result +++ b/mysql-test/suite/innodb_gis/r/rollback.result @@ -411,6 +411,6 @@ set session debug="+d,row_mysql_crash_if_error"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query insert into t1 values(5, point(5,5), point(5,5), 5); drop table t1; diff --git a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result index fccee685caf..ca1a989f253 100644 --- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result +++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result @@ -29,12 +29,12 @@ SET SESSION debug_dbug="+d,ib_import_before_commit_crash"; SELECT * FROM t1; ERROR HY000: Tablespace has been discarded for table `t1` ALTER TABLE t1 IMPORT TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET SESSION debug_dbug="+d,ib_import_before_checkpoint_crash"; SELECT COUNT(*) FROM t1; ERROR HY000: Tablespace has been discarded for table `t1` ALTER TABLE t1 IMPORT TABLESPACE; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query unlink: t1.ibd unlink: t1.cfg # Restart and reconnect to the server diff --git a/mysql-test/suite/maria/bulk_insert_crash.result b/mysql-test/suite/maria/bulk_insert_crash.result index fc28bf325ba..0cf5a474939 100644 --- a/mysql-test/suite/maria/bulk_insert_crash.result +++ b/mysql-test/suite/maria/bulk_insert_crash.result @@ -3,7 +3,7 @@ insert into t1 values (1000,1000,1000); insert into t1 select seq,seq+100, seq+200 from seq_1_to_10; SET GLOBAL debug_dbug="+d,crash_end_bulk_insert"; REPLACE into t1 select seq+20,seq+95, seq + 300 from seq_1_to_10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/maria/maria-gis-recovery.result b/mysql-test/suite/maria/maria-gis-recovery.result index f84a01fb854..d95b468bbf6 100644 --- a/mysql-test/suite/maria/maria-gis-recovery.result +++ b/mysql-test/suite/maria/maria-gis-recovery.result @@ -28,7 +28,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -59,7 +59,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; diff --git a/mysql-test/suite/maria/maria-recovery-big.result b/mysql-test/suite/maria/maria-recovery-big.result index a04e24eab74..f9e5c81d8bb 100644 --- a/mysql-test/suite/maria/maria-recovery-big.result +++ b/mysql-test/suite/maria/maria-recovery-big.result @@ -73,7 +73,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; diff --git a/mysql-test/suite/maria/maria-recovery-bitmap.result b/mysql-test/suite/maria/maria-recovery-bitmap.result index c6d0e2cb4e1..78ae6944aa8 100644 --- a/mysql-test/suite/maria/maria-recovery-bitmap.result +++ b/mysql-test/suite/maria/maria-recovery-bitmap.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -47,7 +47,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_bitmap,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/maria-recovery-rtree-ft.result index 3a2716f29d9..329cc71c6e9 100644 --- a/mysql-test/suite/maria/maria-recovery-rtree-ft.result +++ b/mysql-test/suite/maria/maria-recovery-rtree-ft.result @@ -38,7 +38,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t2 back for feeding_recovery * copied t1 back for feeding_recovery * recovery happens @@ -68,7 +68,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -95,7 +95,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -122,7 +122,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -149,7 +149,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text @@ -169,7 +169,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t2 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery.result b/mysql-test/suite/maria/maria-recovery.result index 915dc53b460..9aa9213d9bd 100644 --- a/mysql-test/suite/maria/maria-recovery.result +++ b/mysql-test/suite/maria/maria-recovery.result @@ -22,7 +22,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -49,7 +49,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -74,7 +74,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -100,7 +100,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -127,7 +127,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -171,7 +171,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -210,7 +210,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -242,7 +242,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -272,7 +272,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -316,7 +316,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens connection default; use mysqltest; diff --git a/mysql-test/suite/maria/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result index dee99339a87..4240e76f141 100644 --- a/mysql-test/suite/maria/maria-recovery2.result +++ b/mysql-test/suite/maria/maria-recovery2.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -60,7 +60,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -93,7 +93,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -134,7 +134,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -162,7 +162,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index"; * crashing mysqld intentionally optimize table t_corrupted1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t_corrupted1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/maria-recovery3.result b/mysql-test/suite/maria/maria-recovery3.result index 9d25cd13b90..190a2993e5a 100644 --- a/mysql-test/suite/maria/maria-recovery3.result +++ b/mysql-test/suite/maria/maria-recovery3.result @@ -25,7 +25,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -67,7 +67,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * copied t1 back for feeding_recovery * recovery happens check table t1 extended; @@ -96,7 +96,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash_create_table"; * crashing mysqld intentionally truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text @@ -122,7 +122,7 @@ connection admin; SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/parts/r/debug_fail_myisam.result b/mysql-test/suite/parts/r/debug_fail_myisam.result index ffbc4ff6694..04297563c50 100644 --- a/mysql-test/suite/parts/r/debug_fail_myisam.result +++ b/mysql-test/suite/parts/r/debug_fail_myisam.result @@ -45,7 +45,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -119,7 +119,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -195,7 +195,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -271,7 +271,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -347,7 +347,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -425,7 +425,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -503,7 +503,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -581,7 +581,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -662,7 +662,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -741,7 +741,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2171,7 +2171,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2244,7 +2244,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2319,7 +2319,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2394,7 +2394,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2462,7 +2462,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2530,7 +2530,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2598,7 +2598,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2664,7 +2664,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2728,7 +2728,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -3894,7 +3894,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -3969,7 +3969,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4046,7 +4046,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4123,7 +4123,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4204,7 +4204,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4285,7 +4285,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4366,7 +4366,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4450,7 +4450,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -4534,7 +4534,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -4616,7 +4616,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -4698,7 +4698,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -4778,7 +4778,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD diff --git a/mysql-test/suite/parts/r/debug_innodb_crash.result b/mysql-test/suite/parts/r/debug_innodb_crash.result index 68195967b5b..228796e5498 100644 --- a/mysql-test/suite/parts/r/debug_innodb_crash.result +++ b/mysql-test/suite/parts/r/debug_innodb_crash.result @@ -46,7 +46,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -114,7 +114,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -184,7 +184,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -254,7 +254,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -324,7 +324,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -395,7 +395,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -466,7 +466,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -537,7 +537,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -610,7 +610,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -681,7 +681,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -753,7 +753,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -820,7 +820,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -889,7 +889,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -958,7 +958,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1021,7 +1021,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1084,7 +1084,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1147,7 +1147,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -1208,7 +1208,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -1268,7 +1268,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -1333,7 +1333,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -1402,7 +1402,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1473,7 +1473,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1544,7 +1544,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1617,7 +1617,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1690,7 +1690,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1763,7 +1763,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1838,7 +1838,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1913,7 +1913,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -1986,7 +1986,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -2059,7 +2059,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -2131,7 +2131,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd diff --git a/mysql-test/suite/parts/r/debug_myisam_crash.result b/mysql-test/suite/parts/r/debug_myisam_crash.result index 5252af12db1..2b0f6973228 100644 --- a/mysql-test/suite/parts/r/debug_myisam_crash.result +++ b/mysql-test/suite/parts/r/debug_myisam_crash.result @@ -45,7 +45,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -119,7 +119,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -195,7 +195,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -271,7 +271,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -347,7 +347,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -425,7 +425,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -503,7 +503,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -581,7 +581,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -662,7 +662,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -741,7 +741,7 @@ a b 4 Original from partition p0 ALTER TABLE t1 ADD PARTITION (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -821,7 +821,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -894,7 +894,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -969,7 +969,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1044,7 +1044,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1112,7 +1112,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1180,7 +1180,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1248,7 +1248,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -1314,7 +1314,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -1378,7 +1378,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 DROP PARTITION p10; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -1447,7 +1447,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -1522,7 +1522,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1599,7 +1599,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1676,7 +1676,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1757,7 +1757,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1838,7 +1838,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -1919,7 +1919,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2003,7 +2003,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-shadow-t1.frm #sql-shadow-t1.par @@ -2087,7 +2087,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2169,7 +2169,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2251,7 +2251,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -2331,7 +2331,7 @@ a b ALTER TABLE t1 REORGANIZE PARTITION p10 INTO (PARTITION p10 VALUES IN (10,11,12,13,14,15,16,17,18,19), PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29)); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result index 7c083d826cf..571ab329bc2 100644 --- a/mysql-test/suite/parts/r/partition_debug.result +++ b/mysql-test/suite/parts/r/partition_debug.result @@ -76,7 +76,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -191,7 +191,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -306,7 +306,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -421,7 +421,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -527,7 +527,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -633,7 +633,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -739,7 +739,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -845,7 +845,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD @@ -960,7 +960,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.MYD diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result index e2631d0d708..6cee58e0074 100644 --- a/mysql-test/suite/parts/r/partition_debug_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_innodb.result @@ -62,7 +62,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -170,7 +170,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -278,7 +278,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -386,7 +386,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -488,7 +488,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.frm # State after crash recovery @@ -590,7 +590,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.ibd # State after crash recovery @@ -692,7 +692,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) #sql-exchange.ibd # State after crash recovery @@ -794,7 +794,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd @@ -902,7 +902,7 @@ a b 3 Original from partition p0 4 Original from partition p0 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # State after crash (before recovery) db.opt t1#P#p0.ibd diff --git a/mysql-test/suite/plugins/t/multiauth.test b/mysql-test/suite/plugins/t/multiauth.test index 73538f23832..66f29bdbfec 100644 --- a/mysql-test/suite/plugins/t/multiauth.test +++ b/mysql-test/suite/plugins/t/multiauth.test @@ -1,3 +1,4 @@ +--source include/not_ubsan.inc let $REGEX_VERSION_ID=/$mysql_get_server_version/VERSION_ID/; let $REGEX_PASSWORD_LAST_CHANGED=/password_last_changed": [0-9]*/password_last_changed": #/; let $REGEX_GLOBAL_PRIV=$REGEX_PASSWORD_LAST_CHANGED $REGEX_VERSION_ID; diff --git a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result index deea7caa12a..5675562a840 100644 --- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result +++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result @@ -2,7 +2,7 @@ include/master-slave.inc [connection master] connection slave; call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*"); -call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'"); +call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to server at 'reading initial communication packet'"); call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; .*"); call mtr.add_suppression("Slave I/O thread .* register on master"); SET @saved_dbug = @@GLOBAL.debug_dbug; diff --git a/mysql-test/suite/rpl/r/rpl_sync.result b/mysql-test/suite/rpl/r/rpl_sync.result index 1240c446164..5fa3a07a4e7 100644 --- a/mysql-test/suite/rpl/r/rpl_sync.result +++ b/mysql-test/suite/rpl/r/rpl_sync.result @@ -22,7 +22,7 @@ connection slave; include/stop_slave_io.inc SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc @@ -40,7 +40,7 @@ insert into t1(a) values(9); connection slave; SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test index 02665c70b9e..9e3c771ed98 100644 --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test @@ -21,7 +21,7 @@ source include/have_binlog_format_mixed.inc; connection slave; call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed: .*"); -call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to MySQL server at 'reading initial communication packet'"); +call mtr.add_suppression("Slave I/O: .* failed with error: Lost connection to server at 'reading initial communication packet'"); call mtr.add_suppression("Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; .*"); call mtr.add_suppression("Slave I/O thread .* register on master"); diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc index dff31cb2b97..025f8a8922d 100644 --- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc +++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc @@ -23,8 +23,7 @@ select VARIABLE_NAME,VARIABLE_SCOPE,VARIABLE_TYPE,VARIABLE_COMMENT,NUMERIC_MIN_V variable_name not like 'wsrep%' and variable_name not like 's3%' and variable_name not in ( - 'have_sanitizer', - 'log_tc_size' + 'log_tc_size','have_sanitizer' ) order by variable_name; diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index e4ab38f611d..7d2ca937de2 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -9,8 +9,7 @@ where variable_name not like 'debug%' and variable_name not like 'wsrep%' and variable_name not like 's3%' and variable_name not in ( -'have_sanitizer', -'log_tc_size' +'log_tc_size','have_sanitizer' ) order by variable_name; VARIABLE_NAME ALTER_ALGORITHM diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 7cdfdff7129..3498d5de743 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -9,8 +9,7 @@ where variable_name not like 'debug%' and variable_name not like 'wsrep%' and variable_name not like 's3%' and variable_name not in ( -'have_sanitizer', -'log_tc_size' +'log_tc_size','have_sanitizer' ) order by variable_name; VARIABLE_NAME ALTER_ALGORITHM diff --git a/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result b/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result new file mode 100644 index 00000000000..525619dba29 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result @@ -0,0 +1,5 @@ +SET GLOBAL wsrep_on=ON; +ERROR HY000: WSREP (galera) can't be enabled if the wsrep_provider is unset or set to 'none' +SELECT @@global.wsrep_on; +@@global.wsrep_on +0 diff --git a/mysql-test/suite/sys_vars/t/thread_stack_basic.test b/mysql-test/suite/sys_vars/t/thread_stack_basic.test index 6aeda532fde..39f120e0de1 100644 --- a/mysql-test/suite/sys_vars/t/thread_stack_basic.test +++ b/mysql-test/suite/sys_vars/t/thread_stack_basic.test @@ -2,6 +2,7 @@ # only global # --source include/not_asan.inc +--source include/not_ubsan.inc --replace_result 392192 299008 select @@global.thread_stack; --error ER_INCORRECT_GLOBAL_LOCAL_VAR diff --git a/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test b/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test new file mode 100644 index 00000000000..5bee3c9a356 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test @@ -0,0 +1,9 @@ +--source include/not_embedded.inc + +# +# @@global.wsrep_on is not allowed if there +# is no wsrep_provider +# +--error ER_WRONG_ARGUMENTS +SET GLOBAL wsrep_on=ON; +SELECT @@global.wsrep_on;
\ No newline at end of file diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result index d0aa49f2fde..e07f1408ab7 100644 --- a/mysql-test/suite/versioning/r/alter.result +++ b/mysql-test/suite/versioning/r/alter.result @@ -746,6 +746,23 @@ alter table t1 add column y timestamp(6) as row start; ERROR HY000: Table `t1` is not system-versioned drop table t1; # +# MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from system-versioned table +# +create table t1 (pk int, a int, primary key (pk), key (a)) +with system versioning; +insert into t1 values (1, 1), (2, 2); +delete from t1; +set system_versioning_alter_history= keep; +alter table t1 drop pk; +drop table t1; +create table t1 (pk int, a int, primary key (pk), key (a)) +with system versioning; +insert into t1 values (1, 2), (2, 8), (3, 4), (4, 4), (5, 0); +delete from t1; +set system_versioning_alter_history= keep; +alter ignore table t1 drop pk; +drop table t1; +# # MDEV-21941 RENAME doesn't work for system time or period fields # create or replace table t1 (a int) with system versioning; diff --git a/mysql-test/suite/versioning/t/alter.test b/mysql-test/suite/versioning/t/alter.test index 786627da35e..9d3101fb4ad 100644 --- a/mysql-test/suite/versioning/t/alter.test +++ b/mysql-test/suite/versioning/t/alter.test @@ -632,6 +632,29 @@ alter table t1 add column y timestamp(6) as row start; # cleanup drop table t1; + +--echo # +--echo # MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from system-versioned table +--echo # +create table t1 (pk int, a int, primary key (pk), key (a)) +with system versioning; +insert into t1 values (1, 1), (2, 2); +delete from t1; +set system_versioning_alter_history= keep; +alter table t1 drop pk; +# cleanup +drop table t1; + +create table t1 (pk int, a int, primary key (pk), key (a)) +with system versioning; +insert into t1 values (1, 2), (2, 8), (3, 4), (4, 4), (5, 0); +delete from t1; +set system_versioning_alter_history= keep; +alter ignore table t1 drop pk; +# cleanup +drop table t1; + + --echo # --echo # MDEV-21941 RENAME doesn't work for system time or period fields --echo # diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def index a1c8165d165..991109d72b8 100644 --- a/mysql-test/suite/wsrep/disabled.def +++ b/mysql-test/suite/wsrep/disabled.def @@ -14,3 +14,4 @@ mdev_6832: wsrep_provider is read-only for security reasons MDEV-23092: wsrep_provider is read-only for security reasons wsrep_variables_no_provider: wsrep_provider is read-only for security reasons +MDEV-22443: it is no longer allowed enable wsrep_on if wsrep_provider is 'none' diff --git a/mysql-test/suite/sys_vars/r/wsrep_on_basic.result b/mysql-test/suite/wsrep/r/wsrep_on_basic.result index 735e2d77180..b3186fa674f 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_on_basic.result +++ b/mysql-test/suite/wsrep/r/wsrep_on_basic.result @@ -7,10 +7,10 @@ SET @wsrep_on_session_saved = @@session.wsrep_on; # default SELECT @@global.wsrep_on; @@global.wsrep_on -0 +1 SELECT @@session.wsrep_on; @@session.wsrep_on -0 +1 # scope and valid values SET @@global.wsrep_on=OFF; diff --git a/mysql-test/suite/wsrep/t/wsrep_on_basic.opt b/mysql-test/suite/wsrep/t/wsrep_on_basic.opt new file mode 100644 index 00000000000..9da4dd32881 --- /dev/null +++ b/mysql-test/suite/wsrep/t/wsrep_on_basic.opt @@ -0,0 +1 @@ +--wsrep-provider=$WSREP_PROVIDER --binlog_format=ROW --wsrep-cluster-address=gcomm:// diff --git a/mysql-test/suite/sys_vars/t/wsrep_on_basic.test b/mysql-test/suite/wsrep/t/wsrep_on_basic.test index 229d771b5e7..98062dbec83 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_on_basic.test +++ b/mysql-test/suite/wsrep/t/wsrep_on_basic.test @@ -1,4 +1,6 @@ --source include/have_wsrep.inc +--source include/have_wsrep_provider.inc +--source include/have_innodb.inc --echo # --echo # wsrep_on |