1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialised variable in binlog group commit (probably not

Browse Source 
reachable code).

Fix test failure when $vardir does not allow executing programs.
This commit is contained in:
unknown 2013-01-21 10:06:03 +01:00
parent 3546644220
commit 2b0f4bdf44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_dbi_dbd-mysql.inc
View File

@ -58,9 +58,7 @@
--let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-mysql.pl --let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-mysql.pl
--let $resultFile= $MYSQL_TMP_DIR/dbidbd-mysql.txt --let $resultFile= $MYSQL_TMP_DIR/dbidbd-mysql.txt
# Make the script executable and execute it. --exec perl $perlChecker
--chmod 0755 $perlChecker
--exec $perlChecker
# Source the resulting temporary file and look for a variable being set. # Source the resulting temporary file and look for a variable being set.
--source $resultFile --source $resultFile

6
sql/log.cc
View File

@ -6379,8 +6379,6 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
DBUG_ENTER("MYSQL_BIN_LOG::trx_group_commit_leader"); DBUG_ENTER("MYSQL_BIN_LOG::trx_group_commit_leader");
LINT_INIT(binlog_id); 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 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 */); 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. */ /* 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. Commit every transaction in the queue.