Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
0fd8d82a
Commit
0fd8d82a
authored
Feb 14, 2001
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql sql/slave.cc: Auto merged
parents
dcd26ca7
9a17a41e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
mysql-test/r/rpl000002.result
mysql-test/r/rpl000002.result
+4
-0
mysql-test/t/rpl000002.test
mysql-test/t/rpl000002.test
+18
-1
sql/slave.cc
sql/slave.cc
+2
-1
No files found.
mysql-test/r/rpl000002.result
View file @
0fd8d82a
...
@@ -2,3 +2,7 @@ n
...
@@ -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
mysql-test/t/rpl000002.test
View file @
0fd8d82a
...
@@ -9,9 +9,26 @@ save_master_pos;
...
@@ -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
;
sql/slave.cc
View file @
0fd8d82a
...
@@ -857,6 +857,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
...
@@ -857,6 +857,7 @@ 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
if
(
!
ev
->
when
)
ev
->
when
=
time
(
NULL
);
ev
->
when
=
time
(
NULL
);
switch
(
type_code
)
{
switch
(
type_code
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment