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 /mysql-test/r/rpl_log.result | |
| 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 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 7813d4d779d..9fcab2a7cbe 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -68,12 +68,12 @@ master-bin.000002 168 Query 1 168 use `test`; insert into t1 values (1) master-bin.000002 228 Query 1 228 use `test`; drop table t1 show binary logs; Log_name File_size -master-bin.000001 0 +master-bin.000001 1171 master-bin.000002 276 start slave; show binary logs; Log_name File_size -slave-bin.000001 0 +slave-bin.000001 1285 slave-bin.000002 170 show binlog events in 'slave-bin.000001' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info |