From 7cd2fb13ff6934cea17b470c673b45f1836a85ea Mon Sep 17 00:00:00 2001
From: "gbichot@production.mysql.com" <>
Date: Mon, 18 Jul 2005 14:46:53 +0200
Subject: 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.

---
 sql/sql_repl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_repl.cc')

diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index fe95ee26748..963c4ccf5a6 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -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));
-- 
cgit v1.2.1