database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-21 11:45:00 +03:00
parent 502b769561 d104fe6f73
commit 4930f9c94b
187 changed files with 2121 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/binlog_encryption/binlog_index.result
View File

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

4
mysql-test/suite/binlog_encryption/rpl_sync.result
View File

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