bk commit into 4.1 tree (gbichot:1.2339) BUG#12004

[guilhem]

Below is the list of changes that have just been committed into a local
4.1 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2339 05/07/18 14:46:53 gbichot@stripped +4 -0
  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
    1.137 05/07/18 14:46:49 gbichot@stripped +1 -1
    my_open() needs the complete name, not only the base name

  sql/mysqld.cc
    1.581 05/07/18 14:46:48 gbichot@stripped +1 -1
    don't lock LOCK_thread_count when you already have it

  mysql-test/r/rpl_rotate_logs.result
    1.57 05/07/18 14:46:48 gbichot@stripped +5 -5
    correcting binlog sizes

  mysql-test/r/rpl_log.result
    1.54 05/07/18 14:46:48 gbichot@stripped +2 -2
    correcting binlog sizes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	production.mysql.com
# Root:	/nfstmp1/guilhem/mysql-4.1-prod

--- 1.580/sql/mysqld.cc	2005-07-15 11:51:47 +02:00
+++ 1.581/sql/mysqld.cc	2005-07-18 14:46:48 +02:00
@@ -663,7 +663,7 @@
      project.  This will wake up the socket on Windows and prevent the
      printing of the error message that we are force closing a connection.
     */
-    close_connection(tmp, 0, 1);  
+    close_connection(tmp, 0, 0);  
     if (tmp->mysys_var)
     {
       tmp->mysys_var->abort=1;

--- 1.56/mysql-test/r/rpl_rotate_logs.result	2005-05-19 12:34:00 +02:00
+++ 1.57/mysql-test/r/rpl_rotate_logs.result	2005-07-18 14:46:48 +02:00
@@ -27,8 +27,8 @@
 flush logs;
 show binary logs;
 Log_name	File_size
-master-bin.000001	0
-master-bin.000002	0
+master-bin.000001	461
+master-bin.000002	213
 master-bin.000003	4
 create table t3 select * from temp_table;
 select * from t3;
@@ -43,12 +43,12 @@
 purge master logs to 'master-bin.000002';
 show master logs;
 Log_name	File_size
-master-bin.000002	0
+master-bin.000002	213
 master-bin.000003	229
 purge binary logs to 'master-bin.000002';
 show binary logs;
 Log_name	File_size
-master-bin.000002	0
+master-bin.000002	213
 master-bin.000003	229
 purge master logs before now();
 show binary logs;
@@ -74,7 +74,7 @@
 create table t4 select * from temp_table;
 show binary logs;
 Log_name	File_size
-master-bin.000003	0
+master-bin.000003	4167
 master-bin.000004	2886
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB

--- 1.53/mysql-test/r/rpl_log.result	2005-05-19 12:34:00 +02:00
+++ 1.54/mysql-test/r/rpl_log.result	2005-07-18 14:46:48 +02:00
@@ -68,12 +68,12 @@
 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

--- 1.136/sql/sql_repl.cc	2005-06-03 21:10:25 +02:00
+++ 1.137/sql/sql_repl.cc	2005-07-18 14:46:49 +02:00
@@ -1384,7 +1384,7 @@
     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));