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 branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-29 13:23:18 +01:00
parent 48dc7cc66e c13b501162
commit 4a5d25c338
802 changed files with 37504 additions and 15141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/suite/binlog_encryption/rpl_init_slave_errors.result Normal file
View File

@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
connection slave;
stop slave;
reset slave;
connection slave;
SET GLOBAL debug_dbug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
start slave;
include/wait_for_slave_sql_error.inc [errno=1593]
Last_SQL_Error = 'Failed during slave thread initialization'
call mtr.add_suppression("Failed during slave.* thread initialization");
SET GLOBAL debug_dbug= "";
connection slave;
reset slave;
SET GLOBAL init_slave= "garbage";
start slave;
include/wait_for_slave_sql_error.inc [errno=1064]
Last_SQL_Error = 'Slave SQL thread aborted. Can't execute init_slave query'
SET GLOBAL init_slave= "";
include/stop_slave_io.inc
RESET SLAVE;
include/rpl_end.inc