diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
| commit | 14d62505d90f01eb6d81466c1d69fa38523c4d3e (patch) | |
| tree | 98e08ad71dd605fdfbad22080be969ecae6747ce /sql/slave.cc | |
| parent | 868c2ceb013e06c29ba37d4634f2d543b96539aa (diff) | |
| parent | 9fc102b37ec45bf5a1010a9f660137304de482bc (diff) | |
| download | mariadb-git-14d62505d90f01eb6d81466c1d69fa38523c4d3e.tar.gz | |
Merge tag 'mariadb-10.0.26' into 10.0-galera
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index e9db77a0924..f33e416aad2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2015, MariaDB +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4325,7 +4325,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; @@ -4360,7 +4361,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); } @@ -4647,11 +4647,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)) |