database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/mysql_src/mysql-4.1
This commit is contained in:
unknown
2004-03-02 23:08:24 +01:00
parent aff2963c7f f34c3fff49
commit 1e3fadebda
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/slave.cc
View File

@@ -2060,10 +2060,29 @@ int show_master_info(THD* thd, MASTER_INFO* mi)
protocol->store(mi->ssl_key, &my_charset_bin);
if (mi->rli.last_master_timestamp)
protocol->store((ulonglong)
(long)((time_t)time((time_t*) 0)
{
long tmp= (long)((time_t)time((time_t*) 0)
- mi->rli.last_master_timestamp)
- mi->clock_diff_with_master);
- mi->clock_diff_with_master;
/*
Apparently on some systems tmp can be <0. Here are possible reasons
related to MySQL:
- the master is itself a slave of another master whose time is ahead.
- somebody used an explicit SET TIMESTAMP on the master.
Possible reason related to granularity-to-second of time functions
(nothing to do with MySQL), which can explain a value of -1:
assume the master's and slave's time are perfectly synchronized, and
that at slave's connection time, when the master's timestamp is read,
it is at the very end of second 1, and (a very short time later) when
the slave's timestamp is read it is at the very beginning of second
2. Then the recorded value for master is 1 and the recorded value for
slave is 2. At SHOW SLAVE STATUS time, assume that the difference
between timestamp of slave and rli->last_master_timestamp is 0
(i.e. they are in the same second), then we get 0-(2-1)=-1 as a result.
This confuses users, so we don't go below 0.
*/
protocol->store((longlong)(max(0, tmp)));
}
else
protocol->store_null();