diff options
| author | unknown <gbichot@production.mysql.com> | 2005-07-18 14:46:53 +0200 |
|---|---|---|
| committer | unknown <gbichot@production.mysql.com> | 2005-07-18 14:46:53 +0200 |
| commit | 750eedd9abdb22b64559b8a43b58679884d84e7c (patch) | |
| tree | 3dd64de1267e6a7886aec0521ceec86cfe4789e3 /sql/sql_repl.cc | |
| parent | 3ee08038551ec23194e0d5ebad86addad05cd571 (diff) | |
| download | mariadb-git-750eedd9abdb22b64559b8a43b58679884d84e7c.tar.gz | |
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
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |