Skip to content

Commit

Permalink
Fixed for failures in buildbot: Replication
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vuvova committed Jun 22, 2016
1 parent 805703f commit a10fd65
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
1 change: 1 addition & 0 deletions mysql-test/suite/rpl/r/rpl_ignore_table.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions mysql-test/suite/rpl/t/rpl_ignore_table.test
Original file line number Diff line number Diff line change
@@ -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'");
Expand Down Expand Up @@ -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
7 changes: 5 additions & 2 deletions sql/slave.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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))
Expand Down
8 changes: 0 additions & 8 deletions storage/tokudb/mysql-test/rpl/combinations

This file was deleted.

0 comments on commit a10fd65

Please sign in to comment.