Fix uninitialised variable in binlog group commit (probably not
reachable code). Fix test failure when $vardir does not allow executing programs.
This commit is contained in:
parent
3546644220
commit
2b0f4bdf44
@ -58,9 +58,7 @@
|
||||
--let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-mysql.pl
|
||||
--let $resultFile= $MYSQL_TMP_DIR/dbidbd-mysql.txt
|
||||
|
||||
# Make the script executable and execute it.
|
||||
--chmod 0755 $perlChecker
|
||||
--exec $perlChecker
|
||||
--exec perl $perlChecker
|
||||
|
||||
# Source the resulting temporary file and look for a variable being set.
|
||||
--source $resultFile
|
||||
|
@ -6379,8 +6379,6 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
|
||||
DBUG_ENTER("MYSQL_BIN_LOG::trx_group_commit_leader");
|
||||
LINT_INIT(binlog_id);
|
||||
|
||||
DBUG_ASSERT(is_open());
|
||||
if (likely(is_open())) // Should always be true
|
||||
{
|
||||
/*
|
||||
Lock the LOCK_log(), and once we get it, collect any additional writes
|
||||
@ -6407,7 +6405,11 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
|
||||
DBUG_ASSERT(leader == queue /* the leader should be first in queue */);
|
||||
|
||||
/* Now we have in queue the list of transactions to be committed in order. */
|
||||
}
|
||||
|
||||
DBUG_ASSERT(is_open());
|
||||
if (likely(is_open())) // Should always be true
|
||||
{
|
||||
/*
|
||||
Commit every transaction in the queue.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user