diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
| commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
| tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /mysql-test/suite/binlog_encryption | |
| parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
| parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
| download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
| -rw-r--r-- | mysql-test/suite/binlog_encryption/binlog_index.result | 12 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_sync.result | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/binlog_encryption/binlog_index.result b/mysql-test/suite/binlog_encryption/binlog_index.result index f643c5a9c35..4c353bf6abb 100644 --- a/mysql-test/suite/binlog_encryption/binlog_index.result +++ b/mysql-test/suite/binlog_encryption/binlog_index.result @@ -50,7 +50,7 @@ reset master; flush logs; SET SESSION debug_dbug="+d,crash_purge_before_update_index"; purge binary logs TO 'master-bin.000002'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -62,7 +62,7 @@ master-bin.000003 flush logs; SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; purge binary logs TO 'master-bin.000004'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -73,7 +73,7 @@ master-bin.000005 flush logs; SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; purge binary logs TO 'master-bin.000006'; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -83,7 +83,7 @@ master-bin.000007 # crash_create_non_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -94,7 +94,7 @@ master-bin.000008 # crash_create_critical_before_update_index SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -106,7 +106,7 @@ master-bin.000009 # crash_create_after_update_index SET SESSION debug_dbug="+d,crash_create_after_update_index"; flush logs; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index diff --git a/mysql-test/suite/binlog_encryption/rpl_sync.result b/mysql-test/suite/binlog_encryption/rpl_sync.result index 1240c446164..5fa3a07a4e7 100644 --- a/mysql-test/suite/binlog_encryption/rpl_sync.result +++ b/mysql-test/suite/binlog_encryption/rpl_sync.result @@ -22,7 +22,7 @@ connection slave; include/stop_slave_io.inc SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc @@ -40,7 +40,7 @@ insert into t1(a) values(9); connection slave; SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc =====Dumping and comparing tables=======; include/start_slave.inc |