Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
MariaDB
Commits
67ef6de0
Commit
67ef6de0
authored
23 years ago
by
unknown
Browse files
Options
Download
Plain Diff
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents
c340c3d7
005be09e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
mysql-test/t/rpl000012.test
mysql-test/t/rpl000012.test
+1
-0
sql/slave.cc
sql/slave.cc
+0
-1
No files found.
mysql-test/t/rpl000012.test
View file @
67ef6de0
...
...
@@ -9,6 +9,7 @@ insert into t2 select * from t1;
drop
table
if
exists
test
.
t3
;
create
temporary
table
test
.
t3
(
n
int
not
null
);
alter
table
test
.
t3
add
primary
key
(
n
);
flush
logs
;
insert
into
t3
values
(
100
);
insert
into
t2
select
*
from
t3
;
drop
table
if
exists
test
.
t3
;
...
...
This diff is collapsed.
Click to expand it.
sql/slave.cc
View file @
67ef6de0
...
...
@@ -1104,7 +1104,6 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
}
case
START_EVENT
:
close_temporary_tables
(
thd
);
mi
->
inc_pos
(
event_len
);
flush_master_info
(
mi
);
delete
ev
;
...
...
This diff is collapsed.
Click to expand it.
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