commit 76e0e9a7561de3d5a021f98c4178768a34dbacdc Author: Georg Richter Date: Thu Jul 8 13:25:38 2021 +0200 MDEV-26113: Replace MariaDB Connector/C 3.1 Since MariaDB Connector / C 3.1 has reached the end of its term, it has been replaced by the current version 3.2. Due to the integration of the tasks MDEV-8334 (rename utf8 to utf8mb3) and MDEV-22189 (change error messages) in MariaDB Connector / C 3.2, numerous tests had to be adapted. diff --git a/libmariadb b/libmariadb index 802ce584a26..fffa8167d88 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit 802ce584a26fdc0ba67fcf35e277bf3c7440956a +Subproject commit fffa8167d883bbf841ecb04a77abe2fbf1d1dfc9 diff --git a/mysql-test/r/connect_debug.result b/mysql-test/r/connect_debug.result index cc3da50ec6b..2adafc2c4a9 100644 --- a/mysql-test/r/connect_debug.result +++ b/mysql-test/r/connect_debug.result @@ -11,10 +11,10 @@ drop user bad; set global debug_dbug='+d,increase_srv_handshake_scramble_len'; connect(localhost,root,,test,MASTER_MYPORT,MYSQL_TMP_DIR/mysqld.1.sock); connect con1,localhost,root; -ERROR HY000: received malformed packet +ERROR HY000: Received malformed packet set global debug_dbug=@old_dbug; set global debug_dbug='+d,poison_srv_handshake_scramble_len'; connect(localhost,root,,test,MASTER_MYPORT,MYSQL_TMP_DIR/mysqld.1.sock); connect con2,localhost,root; -ERROR HY000: received malformed packet +ERROR HY000: Received malformed packet set global debug_dbug=@old_dbug; diff --git a/mysql-test/r/crash_commit_before.result b/mysql-test/r/crash_commit_before.result index 22d39e1ddbd..55fea1909f0 100644 --- a/mysql-test/r/crash_commit_before.result +++ b/mysql-test/r/crash_commit_before.result @@ -3,7 +3,7 @@ START TRANSACTION; insert into t1 values(9); SET GLOBAL debug_dbug="d,crash_commit_before"; COMMIT; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 95bcb5d6bcc..b6daa0fc38d 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -494,7 +494,7 @@ create table t1 (a int, b int) engine=myisam; insert into t1 values (1,1); SET debug_dbug="d,crash_shutdown"; shutdown; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query call mtr.add_suppression(" marked as crashed and should be repaired"); call mtr.add_suppression("Checking table"); insert delayed into t1 values (2,2); diff --git a/mysql-test/r/myisam_crash_before_flush_keys.result b/mysql-test/r/myisam_crash_before_flush_keys.result index 7d929ffb644..fca8134be16 100644 --- a/mysql-test/r/myisam_crash_before_flush_keys.result +++ b/mysql-test/r/myisam_crash_before_flush_keys.result @@ -17,7 +17,7 @@ SET SESSION debug_dbug="d,crash_before_flush_keys"; # Write file to make mysql-test-run.pl expect crash # Run the crashing query FLUSH TABLE t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Write file to make mysql-test-run.pl start the server # Turn on reconnect # Call script that will poll the server waiting for diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index ec2760ce8a7..ef5332e2142 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -172,14 +172,14 @@ ERROR 1049 (42000) at line 1: Unknown database 'invalid' ERROR 1049 (42000) at line 1: Unknown database 'invalid' Test connect with dbname + hostname Test connect with dbname + _invalid_ hostname -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) +ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno) +ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno) The commands reported in the bug report -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) +ERROR 2005 (HY000) at line 1: Unknown server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) Too long dbname ERROR 1102 (42000) at line 1: Incorrect database name 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx...' Too long hostname -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) +ERROR 2005 (HY000) at line 1: Unknown server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) 1 1 ERROR at line 1: DELIMITER cannot contain a backslash character @@ -208,7 +208,7 @@ COUNT (*) 1 COUNT (*) 1 -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) +ERROR 2005 (HY000) at line 1: Unknown server host 'invalid_hostname' (errno) End of 5.0 tests WARNING: --server-arg option not supported in this configuration. *************************** 1. row *************************** diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 3961c7e8c27..2984bec7dad 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -146,7 +146,7 @@ Version check failed. Got the following error when calling the 'mysql' command l ERROR 1045 (28000): Access denied for user 'mysqltest1'@'localhost' (using password: YES) FATAL ERROR: Upgrade failed Run mysql_upgrade with a non existing server socket -mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect +mysqlcheck: Got error: 2005: Unknown server host 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; Phase 1/7: Checking and upgrading mysql database diff --git a/mysql-test/r/ssl_timeout.result b/mysql-test/r/ssl_timeout.result index 3c94a9927da..e0d1dbed69f 100644 --- a/mysql-test/r/ssl_timeout.result +++ b/mysql-test/r/ssl_timeout.result @@ -5,6 +5,6 @@ SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS have_ssl 1 SELECT SLEEP(600); -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query connection default; disconnect ssl_con; diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index 1f3428e6eef..a407828d856 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_encryption/binlog_index.result b/mysql-test/suite/binlog_encryption/binlog_index.result index 1f3428e6eef..a407828d856 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 604b24a8fab..bb643b231f6 100644 --- a/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result +++ b/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result @@ -97,19 +97,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/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result index f00e48157e7..699fcc8e953 100644 --- a/mysql-test/suite/innodb/r/alter_crash.result +++ b/mysql-test/suite/innodb/r/alter_crash.result @@ -45,7 +45,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. SELECT * FROM information_schema.innodb_sys_tables WHERE table_id = ID; @@ -84,7 +84,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 SELECT * FROM information_schema.innodb_sys_tables WHERE name LIKE 'test/#sql-%'; @@ -122,7 +122,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. SELECT * FROM information_schema.innodb_sys_tables WHERE table_id = ID; diff --git a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result index ad6e17b920c..7570be4bb28 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-tempfile.result +++ b/mysql-test/suite/innodb/r/innodb-alter-tempfile.result @@ -11,7 +11,7 @@ call mtr.add_suppression("InnoDB could not find key no 1 with name f2 from dict 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 # Startup the server after the crash 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 8a6327216d0..4a93501ee85 100644 --- a/mysql-test/suite/innodb/r/innodb-blob.result +++ b/mysql-test/suite/innodb/r/innodb-blob.result @@ -46,7 +46,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 @@ -105,7 +105,7 @@ disconnect con3; connection con2; 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 @@ -136,7 +136,7 @@ info UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2 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 156ef0e56be..ad4d22a9fa7 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 da064b83be6..0fd17cf21ce 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result @@ -14,14 +14,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; @@ -40,12 +40,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 3915b07f12e..f5a29e5b9bd 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_page_cleaner_disabled_debug = 1; @@ -20,6 +20,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_fts/r/sync.result b/mysql-test/suite/innodb_fts/r/sync.result index 4d28866ec82..e1e0e7b3e2a 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 After restart SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); title diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result index 36a39902ca9..e08b86f83ed 100644 --- a/mysql-test/suite/innodb_gis/r/rollback.result +++ b/mysql-test/suite/innodb_gis/r/rollback.result @@ -413,6 +413,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 4036640d3d3..d445f492639 100644 --- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result +++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result @@ -23,12 +23,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/innodb_zip/r/wl6501_1.result b/mysql-test/suite/innodb_zip/r/wl6501_1.result index bf901804be5..a3050e69ec6 100644 --- a/mysql-test/suite/innodb_zip/r/wl6501_1.result +++ b/mysql-test/suite/innodb_zip/r/wl6501_1.result @@ -100,7 +100,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t5; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -126,7 +126,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -152,7 +152,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -178,7 +178,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -204,7 +204,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -316,7 +316,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t5; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -342,7 +342,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -368,7 +368,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -394,7 +394,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -420,7 +420,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -532,7 +532,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -558,7 +558,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -584,7 +584,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -610,7 +610,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -722,7 +722,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -748,7 +748,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -774,7 +774,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -800,7 +800,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -912,7 +912,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -938,7 +938,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -964,7 +964,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -990,7 +990,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -1102,7 +1102,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t1; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -1128,7 +1128,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t2; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -1154,7 +1154,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) @@ -1180,7 +1180,7 @@ Warning 1287 '@@debug' is deprecated and will be removed in a future release. Pl # Write file to make mysql-test-run.pl expect crash and restart # Run the crashing query truncate table t4; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query # Restart the MySQL server select count(*) from t1; count(*) diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result index 554bb2892f6..d1d44bae2e7 100644 --- a/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result +++ b/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result @@ -24,7 +24,7 @@ set session debug = "+d,ib_trunc_crash_while_writing_redo_log"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -60,7 +60,7 @@ set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -99,7 +99,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -137,7 +137,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -175,7 +175,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -215,7 +215,7 @@ set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -254,7 +254,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -292,7 +292,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -330,7 +330,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -370,7 +370,7 @@ set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -409,7 +409,7 @@ set session debug = "+d,ib_trunc_crash_before_log_removal"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -442,7 +442,7 @@ set session debug = "+d,ib_trunc_crash_after_truncate_done"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result index d766ecceaac..e9561a82251 100644 --- a/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result +++ b/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result @@ -24,7 +24,7 @@ set session debug = "+d,ib_trunc_crash_while_writing_redo_log"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -60,7 +60,7 @@ set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -99,7 +99,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -137,7 +137,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -175,7 +175,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -215,7 +215,7 @@ set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -254,7 +254,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -292,7 +292,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -330,7 +330,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -370,7 +370,7 @@ set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -409,7 +409,7 @@ set session debug = "+d,ib_trunc_crash_before_log_removal"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -442,7 +442,7 @@ set session debug = "+d,ib_trunc_crash_after_truncate_done"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -484,7 +484,7 @@ set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check Error Table 'test.t' doesn't exist @@ -511,7 +511,7 @@ set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check Error Table 'test.t' doesn't exist diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result index b5fea6382ff..32fed67c7e7 100644 --- a/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result +++ b/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result @@ -24,7 +24,7 @@ set session debug = "+d,ib_trunc_crash_while_writing_redo_log"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -60,7 +60,7 @@ set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -99,7 +99,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -137,7 +137,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -175,7 +175,7 @@ set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -215,7 +215,7 @@ set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -254,7 +254,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_clust_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -292,7 +292,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -330,7 +330,7 @@ set session debug = "+d,ib_trunc_crash_on_create_of_sec_index"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -370,7 +370,7 @@ set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -409,7 +409,7 @@ set session debug = "+d,ib_trunc_crash_before_log_removal"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK @@ -442,7 +442,7 @@ set session debug = "+d,ib_trunc_crash_after_truncate_done"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead truncate table t; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query check table t; Table Op Msg_type Msg_text test.t check status OK 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 bb7d864b6b1..d7b6911b171 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 0ed49ab8142..4f49d2e6f5b 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/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result index 96ed9b010b7..0b774df3b31 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) #sqlx-nnnn_nnnn.MYD #sqlx-nnnn_nnnn.MYI @@ -536,7 +536,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) #sqlx-nnnn_nnnn.MYD #sqlx-nnnn_nnnn.MYI @@ -651,7 +651,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) #sqlx-nnnn_nnnn.MYD #sqlx-nnnn_nnnn.MYI @@ -766,7 +766,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) #sqlx-nnnn_nnnn.MYD #sqlx-nnnn_nnnn.MYI @@ -881,7 +881,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 @@ -996,7 +996,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 8bae87ee877..4ec5d01a3e1 100644 --- a/mysql-test/suite/parts/r/partition_debug_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_innodb.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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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 @@ -2017,7 +2017,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 @@ -2084,7 +2084,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-t1.frm #sql-t1.par @@ -2153,7 +2153,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-t1.frm #sql-t1.par @@ -2222,7 +2222,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-t1.frm #sql-t1.par @@ -2285,7 +2285,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-t1.frm #sql-t1.par @@ -2348,7 +2348,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-t1.frm #sql-t1.par @@ -2411,7 +2411,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 @@ -2472,7 +2472,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 @@ -2532,7 +2532,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 @@ -3634,7 +3634,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 @@ -3703,7 +3703,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-t1.frm #sql-t1.par @@ -3774,7 +3774,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-t1.frm #sql-t1.par @@ -3845,7 +3845,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-t1.frm #sql-t1.par @@ -3918,7 +3918,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-t1.frm #sql-t1.par @@ -3991,7 +3991,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-t1.frm #sql-t1.par @@ -4064,7 +4064,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-t1.frm #sql-t1.par @@ -4139,7 +4139,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-t1.frm #sql-t1.par @@ -4214,7 +4214,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 @@ -4287,7 +4287,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 @@ -4360,7 +4360,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 @@ -4432,7 +4432,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 @@ -6080,7 +6080,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 @@ -6188,7 +6188,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 @@ -6296,7 +6296,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 @@ -6404,7 +6404,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) #sqlx-nnnn_nnnn.ibd db.opt @@ -6512,7 +6512,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) #sqlx-nnnn_nnnn.ibd db.opt @@ -6620,7 +6620,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) #sqlx-nnnn_nnnn.ibd db.opt @@ -6728,7 +6728,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) #sqlx-nnnn_nnnn.ibd db.opt @@ -6836,7 +6836,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 @@ -6944,7 +6944,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/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result index 0b1004d121d..8395c9c81d3 100644 --- a/mysql-test/suite/parts/r/partition_debug_myisam.result +++ b/mysql-test/suite/parts/r/partition_debug_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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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-t1.frm #sql-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/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/t/ssl_crl.test b/mysql-test/t/ssl_crl.test index 643fb80c747..dc0bb9d962f 100644 --- a/mysql-test/t/ssl_crl.test +++ b/mysql-test/t/ssl_crl.test @@ -8,6 +8,6 @@ --echo # try logging in with a certificate in the server's --ssl-crl : should fail # OpenSSL 1.1.1a correctly rejects the certificate, but the error message is wrong ---replace_result "ERROR 2013 (HY000): Lost connection to MySQL server at 'reading authorization packet', system error: 0" "ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked" "ERROR 2013 (HY000): Lost connection to MySQL server at 'sending authentication information', system error: 32" "ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked" +--replace_result "ERROR 2013 (HY000): Lost connection to server at 'reading authorization packet', system error: 0" "ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked" "ERROR 2013 (HY000): Lost connection to server at 'sending authentication information', system error: 32" "ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked" --error 1 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1 diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 93f23236dbc..16f03cab6ba 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -14170,8 +14170,8 @@ static void test_client_character_set() DIE_UNLESS(rc == 0); mysql_get_character_set_info(mysql, &cs); - DIE_UNLESS(!strcmp(cs.csname, "utf8")); - DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci")); + DIE_UNLESS(!strcmp(cs.csname, "utf8mb3")); + DIE_UNLESS(!strcmp(cs.name, "utf8mb3_general_ci")); /* Restore the default character set */ rc= mysql_set_character_set(mysql, csdefault); myquery(rc); @@ -16952,7 +16952,7 @@ static void test_bug30472() /* Check that we have UTF8 on the server and on the client. */ - DIE_UNLESS(strcmp(character_set_name_4, "utf8") == 0); + DIE_UNLESS(strcmp(character_set_name_4, "utf8mb3") == 0); DIE_UNLESS(strcmp(character_set_client_4, "utf8") == 0); DIE_UNLESS(strcmp(character_set_results_4, "utf8") == 0); DIE_UNLESS(strcmp(collation_connnection_4, "utf8_general_ci") == 0); @@ -19042,7 +19042,7 @@ static void test_bug57058() static void test_bug11766854() { - struct st_mysql_client_plugin *plugin; + struct st_mysql_client_plugin *plugin= NULL; DBUG_ENTER("test_bug11766854"); myheader("test_bug11766854");