mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Fixed for failures in buildbot: Replication
1. remove unnecessary rpl-tokudb combination file. 2. fix rpl_ignore_table to cleanup properly (not leave test grants in memory) 3. check_temp_dir() is supposed to set the error in stmt_da - do it even when called multiple times, this fixes a crash when rpl.rpl_slave_load_tmpdir_not_exist is run twice.
This commit is contained in:
@@ -142,4 +142,5 @@ HEX(word)
|
||||
SELECT * FROM tmptbl504451f4258$1;
|
||||
ERROR 42S02: Table 'test.tmptbl504451f4258$1' doesn't exist
|
||||
DROP TABLE t5;
|
||||
flush privileges;
|
||||
include/rpl_end.inc
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
source include/master-slave.inc;
|
||||
let collation=utf8_unicode_ci;
|
||||
--source include/have_collation.inc
|
||||
source include/have_collation.inc;
|
||||
source include/master-slave.inc;
|
||||
|
||||
call mtr.add_suppression("Can't find record in 't.'");
|
||||
call mtr.add_suppression("Can't find record in 'user'");
|
||||
@@ -180,6 +180,7 @@ SELECT HEX(word) FROM t5;
|
||||
SELECT * FROM tmptbl504451f4258$1;
|
||||
connection master;
|
||||
DROP TABLE t5;
|
||||
flush privileges;
|
||||
sync_slave_with_master;
|
||||
|
||||
--source include/rpl_end.inc
|
||||
|
||||
@@ -4292,7 +4292,8 @@ int check_temp_dir(char* tmp_file)
|
||||
mysql_mutex_lock(&LOCK_thread_count);
|
||||
if (check_temp_dir_run)
|
||||
{
|
||||
result= check_temp_dir_result;
|
||||
if ((result= check_temp_dir_result))
|
||||
my_message(result, tmp_file, MYF(0));
|
||||
goto end;
|
||||
}
|
||||
check_temp_dir_run= 1;
|
||||
@@ -4327,7 +4328,6 @@ int check_temp_dir(char* tmp_file)
|
||||
mysql_file_delete(key_file_misc, tmp_file, MYF(0));
|
||||
|
||||
end:
|
||||
check_temp_dir_result= result;
|
||||
mysql_mutex_unlock(&LOCK_thread_count);
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
@@ -4603,11 +4603,14 @@ log '%s' at position %s, relay log '%s' position: %s%s", RPL_LOG_NAME,
|
||||
|
||||
if (check_temp_dir(rli->slave_patternload_file))
|
||||
{
|
||||
check_temp_dir_result= thd->get_stmt_da()->sql_errno();
|
||||
rli->report(ERROR_LEVEL, thd->get_stmt_da()->sql_errno(), NULL,
|
||||
"Unable to use slave's temporary directory %s - %s",
|
||||
slave_load_tmpdir, thd->get_stmt_da()->message());
|
||||
goto err;
|
||||
}
|
||||
else
|
||||
check_temp_dir_result= 0;
|
||||
|
||||
/* Load the set of seen GTIDs, if we did not already. */
|
||||
if (rpl_load_gtid_slave_state(thd))
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
[row]
|
||||
binlog-format=row
|
||||
|
||||
[stmt]
|
||||
binlog-format=statement
|
||||
|
||||
[mix]
|
||||
binlog-format=mixed
|
||||
Reference in New Issue
Block a user