mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 00:24:30 +02: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.
This commit is contained in:
parent
00c3b9438d
commit
7cd2fb13ff
4 changed files with 9 additions and 9 deletions
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue