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
84f875cf
Commit
84f875cf
authored
Feb 23, 2007
by
gbichot@dl145h.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge dl145h.mysql.com:/users/gbichot/mysql-5.0-rpl
into dl145h.mysql.com:/users/gbichot/mysql-5.1-rpl
parents
54b04ff5
44c6c4cc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+1
-1
sql/slave.cc
sql/slave.cc
+2
-2
No files found.
mysql-test/t/disabled.def
View file @
84f875cf
...
...
@@ -38,5 +38,5 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin
mysql_upgrade : Bug#25074 mysql_upgrade gives inconsisten results
rpl_insert_id
: Guilhem will enable as soon as replication team tree has merged with main tree and so got version number 5.1.16
rpl_insert_id
: replication team will enable as soon as they merge their tree with main tree and so got version number 5.1.17
sql/slave.cc
View file @
84f875cf
...
...
@@ -3667,8 +3667,8 @@ bool rpl_master_has_bug(RELAY_LOG_INFO *rli, uint bug_id)
};
static
struct
st_version_range_for_one_bug
versions_for_all_bugs
[]
=
{
{
24432
,
{
5
,
0
,
24
},
{
5
,
0
,
3
6
}
},
{
24432
,
{
5
,
1
,
12
},
{
5
,
1
,
1
6
}
}
{
24432
,
{
5
,
0
,
24
},
{
5
,
0
,
3
8
}
},
{
24432
,
{
5
,
1
,
12
},
{
5
,
1
,
1
7
}
}
};
const
uchar
*
master_ver
=
rli
->
relay_log
.
description_event_for_exec
->
server_version_split
;
...
...
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