diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 00:24:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 10:40:43 +0200 |
| commit | a10fd659aacd3a23386e5ff61a8c0ef9165690a3 (patch) | |
| tree | 9f83c346211a2d79af82726031b8516a328cf14f /sql | |
| parent | 805703fa8e9dd2dc09b9e3a2b8d7786e541621ff (diff) | |
| download | mariadb-git-a10fd659aacd3a23386e5ff61a8c0ef9165690a3.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 5dce7feed73..5d44fb2b6a8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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)) |