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
8c335b8a
Commit
8c335b8a
authored
Nov 27, 2001
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into mysql.sashanet.com:/reiser-data/mysql
parents
aaed141a
08fc3585
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
7 deletions
+13
-7
mysql-test/r/rpl000016.result
mysql-test/r/rpl000016.result
+1
-1
mysql-test/t/rpl000013.test
mysql-test/t/rpl000013.test
+1
-1
mysql-test/t/rpl000016.test
mysql-test/t/rpl000016.test
+3
-2
sql/slave.cc
sql/slave.cc
+6
-1
sql/sql_base.cc
sql/sql_base.cc
+2
-2
No files found.
mysql-test/r/rpl000016.result
View file @
8c335b8a
...
...
@@ -10,7 +10,7 @@ master-bin.003
Log_name
master-bin.003
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
127.0.0.1 root 9999 60 master-bin.003
184
Yes 0 0
127.0.0.1 root 9999 60 master-bin.003
206
Yes 0 0
m
34
65
...
...
mysql-test/t/rpl000013.test
View file @
8c335b8a
...
...
@@ -12,7 +12,7 @@ insert into t2 select * from t1;
connection
master1
;
create
temporary
table
t1
(
n
int
);
insert
into
t1
values
(
4
),(
5
);
insert
into
t2
select
*
from
t1
;
insert
into
t2
select
*
from
t1
as
t10
;
save_master_pos
;
disconnect
master
;
connection
slave
;
...
...
mysql-test/t/rpl000016.test
View file @
8c335b8a
...
...
@@ -28,7 +28,7 @@ select * from t1;
connection
master
;
flush
logs
;
drop
table
if
exists
t2
;
create
table
t2
(
m
int
not
null
primary
key
);
create
table
t2
(
m
int
not
null
auto_increment
primary
key
);
insert
into
t2
values
(
34
),(
67
),(
123
);
save_master_pos
;
flush
logs
;
...
...
@@ -44,7 +44,8 @@ insert into t2 values(1234);
#same value on the master
connection
master
;
save_master_pos
;
insert
into
t2
values
(
1234
);
set
insert_id
=
1234
;
insert
into
t2
values
(
NULL
);
connection
slave
;
sync_with_master
;
...
...
sql/slave.cc
View file @
8c335b8a
...
...
@@ -885,7 +885,12 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
mi
->
inc_pos
(
event_len
);
flush_master_info
(
mi
);
if
(
slave_skip_counter
)
if
(
slave_skip_counter
&&
/* protect against common user error of
setting the counter to 1 instead of 2
while recovering from an failed
auto-increment insert */
!
(
type_code
==
INTVAR_EVENT
&&
slave_skip_counter
==
1
))
--
slave_skip_counter
;
delete
ev
;
return
0
;
// avoid infinite update loops
...
...
sql/sql_base.cc
View file @
8c335b8a
...
...
@@ -527,10 +527,10 @@ void close_temporary_tables(THD *thd)
if
(
query
)
// we might be out of memory, but this is not fatal
{
// skip temporary tables not created directly by the user
if
(
table
->
table
_name
[
0
]
!=
'#'
)
if
(
table
->
real
_name
[
0
]
!=
'#'
)
{
end
=
strxmov
(
end
,
table
->
table_cache_key
,
"."
,
table
->
table
_name
,
","
,
NullS
);
table
->
real
_name
,
","
,
NullS
);
// here we assume table_cache_key always starts
// with \0 terminated db name
found_user_tables
=
1
;
...
...
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