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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0d4df3cd
Commit
0d4df3cd
authored
May 19, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '10.3' into bb-10.3-cc
# Conflicts: # libmariadb
parents
4cc7f965
7bf4a006
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
libmariadb
libmariadb
+1
-1
sql/rpl_rli.cc
sql/rpl_rli.cc
+2
-1
No files found.
libmariadb
@
252a7c36
Subproject commit
cbc9a71e1d2aff81119c912e6a8dbf5e544b58eb
Subproject commit
252a7c36ef885b5128761a82f9e183621a3e525f
sql/rpl_rli.cc
View file @
0d4df3cd
...
@@ -1780,7 +1780,8 @@ gtid_pos_auto_create_tables(rpl_slave_state::gtid_pos_table **list_ptr)
...
@@ -1780,7 +1780,8 @@ gtid_pos_auto_create_tables(rpl_slave_state::gtid_pos_table **list_ptr)
p
=
strmake
(
p
,
plugin_name
(
*
auto_engines
)
->
str
,
FN_REFLEN
-
(
p
-
buf
));
p
=
strmake
(
p
,
plugin_name
(
*
auto_engines
)
->
str
,
FN_REFLEN
-
(
p
-
buf
));
table_name
.
str
=
buf
;
table_name
.
str
=
buf
;
table_name
.
length
=
p
-
buf
;
table_name
.
length
=
p
-
buf
;
table_case_convert
(
const_cast
<
char
*>
(
table_name
.
str
),
table_name
.
length
);
table_case_convert
(
const_cast
<
char
*>
(
table_name
.
str
),
static_cast
<
uint
>
(
table_name
.
length
));
entry
=
rpl_global_gtid_slave_state
->
alloc_gtid_pos_table
entry
=
rpl_global_gtid_slave_state
->
alloc_gtid_pos_table
(
&
table_name
,
hton
,
rpl_slave_state
::
GTID_POS_AUTO_CREATE
);
(
&
table_name
,
hton
,
rpl_slave_state
::
GTID_POS_AUTO_CREATE
);
if
(
!
entry
)
if
(
!
entry
)
...
...
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