mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fix for BUG#12003 "assertion failure in testsuite (double lock of
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0 for the size of all binlogs but the current one". There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes are very small. Feel free to ask me if you have problems merging them. mysql-test/r/rpl_log.result: correcting binlog sizes mysql-test/r/rpl_rotate_logs.result: correcting binlog sizes sql/mysqld.cc: don't lock LOCK_thread_count when you already have it sql/sql_repl.cc: my_open() needs the complete name, not only the base name
This commit is contained in:
@@ -1384,7 +1384,7 @@ int show_binlogs(THD* thd)
|
||||
else
|
||||
{
|
||||
/* this is an old log, open it and find the size */
|
||||
if ((file= my_open(fname+dir_len, O_RDONLY | O_SHARE | O_BINARY,
|
||||
if ((file= my_open(fname, O_RDONLY | O_SHARE | O_BINARY,
|
||||
MYF(0))) >= 0)
|
||||
{
|
||||
file_length= (ulonglong) my_seek(file, 0L, MY_SEEK_END, MYF(0));
|
||||
|
Reference in New Issue
Block a user