database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge work:/home/bk/mysql

Browse Source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql
This commit is contained in:
sasha@mysql.sashanet.com
2001-02-14 21:31:35 -07:00
parent 3f25e2f3be afaf0cbd0f
commit 4ae63ecab8
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/rpl000002.result
View File

@ -2,3 +2,7 @@ n
2000 2000
2001 2001
2002 2002
id created
1 1970-01-01 06:25:45
id created
1 1970-01-01 06:25:45

19
mysql-test/t/rpl000002.test
View File

@ -9,9 +9,26 @@ save_master_pos;
connection slave; connection slave;
use test; use test;
sync_with_master; sync_with_master;
@r/rpl000002.result select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
slave stop;
connection master;
drop table if exists t2;
create table t2(id int auto_increment primary key, created datetime);
set timestamp=12345;
insert into t2 set created=now();
select * from t2;
save_master_pos;
connection slave;
slave start;
sync_with_master;
select * from t2;
connection master;
drop table t2;
save_master_pos;
connection slave;
sync_with_master;

3
sql/slave.cc
View File

@ -857,7 +857,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
thd->server_id = ev->server_id; // use the original server id for logging thd->server_id = ev->server_id; // use the original server id for logging
thd->set_time(); // time the query thd->set_time(); // time the query
ev->when = time(NULL); if(!ev->when)
ev->when = time(NULL);
switch(type_code) { switch(type_code) {
case QUERY_EVENT: case QUERY_EVENT: