diff options
| author | unknown <gbichot@production.mysql.com> | 2005-07-18 14:51:13 +0200 |
|---|---|---|
| committer | unknown <gbichot@production.mysql.com> | 2005-07-18 14:51:13 +0200 |
| commit | ffa7e3f1c805422c1c4e4b5dfcf47a3f31618c92 (patch) | |
| tree | 6881d32cce62659d75f36ebc3028ec063d414930 | |
| parent | c4a3500d5e66b366309f4e5e8748c63e34984c6f (diff) | |
| parent | 750eedd9abdb22b64559b8a43b58679884d84e7c (diff) | |
| download | mariadb-git-ffa7e3f1c805422c1c4e4b5dfcf47a3f31618c92.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
| -rw-r--r-- | mysql-test/r/rpl_log.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result | 10 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
4 files changed, 9 insertions, 9 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 diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index 66eef482a63..9f74cdb9502 100644 --- a/mysql-test/r/rpl_rotate_logs.result +++ b/mysql-test/r/rpl_rotate_logs.result @@ -27,8 +27,8 @@ insert into t2 values (34),(67),(123); 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 @@ start slave; 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 @@ count(*) 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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 02a775f64d1..3f4b002e369 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -663,7 +663,7 @@ static void close_connections(void) 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; 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)); |