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
df6dfef4
Commit
df6dfef4
authored
Mar 04, 2020
by
Sachin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile failure fixed
parent
0ec13c0a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
sql/sql_parse.cc
sql/sql_parse.cc
+0
-8
sql/sql_table.cc
sql/sql_table.cc
+2
-2
No files found.
sql/sql_parse.cc
View file @
df6dfef4
...
...
@@ -5716,10 +5716,6 @@ mysql_execute_command(THD *thd)
DBUG_ASSERT
(
thd
->
rgi_slave
);
Master_info
*
mi
=
thd
->
rgi_slave
->
rli
->
mi
;
start_alter_info
*
info
=
NULL
;
char
temp
[
thd
->
query_length
()
+
10
];
strcpy
(
temp
,
thd
->
query
());
char
*
alter_location
=
strcasestr
(
temp
,
"ALTER"
);
char
send_query
[
thd
->
query_length
()
+
20
];
mysql_mutex_lock
(
&
mi
->
start_alter_list_lock
);
List_iterator
<
start_alter_info
>
info_iterator
(
mi
->
start_alter_list
);
while
((
info
=
info_iterator
++
))
...
...
@@ -5809,10 +5805,6 @@ mysql_execute_command(THD *thd)
DBUG_ASSERT
(
thd
->
rgi_slave
);
Master_info
*
mi
=
thd
->
rgi_slave
->
rli
->
mi
;
start_alter_info
*
info
=
NULL
;
char
temp
[
thd
->
query_length
()
+
10
];
strcpy
(
temp
,
thd
->
query
());
char
*
alter_location
=
strcasestr
(
temp
,
"ALTER"
);
char
send_query
[
thd
->
query_length
()
+
20
];
mysql_mutex_lock
(
&
mi
->
start_alter_list_lock
);
List_iterator
<
start_alter_info
>
info_iterator
(
mi
->
start_alter_list
);
while
((
info
=
info_iterator
++
))
...
...
sql/sql_table.cc
View file @
df6dfef4
...
...
@@ -9453,7 +9453,7 @@ static bool write_start_alter(THD *thd, bool* partial_alter, start_alter_info *i
}
else
if
(
opt_binlog_split_alter
)
{
char
send_query
[
thd
->
query_length
()
+
20
]
;
char
*
send_query
=
(
char
*
)
thd
->
alloc
(
thd
->
query_length
()
+
20
)
;
thd
->
transaction
.
start_alter
=
true
;
sprintf
(
send_query
,
"/*!100001 START %lld %s */"
,
thd
->
thread_id
,
thd
->
query
());
if
(
write_bin_log
(
thd
,
FALSE
,
send_query
,
strlen
(
send_query
),
true
))
...
...
@@ -9514,7 +9514,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
uint
order_num
,
ORDER
*
order
,
bool
ignore
)
{
bool
engine_changed
;
char
send_query
[
thd
->
query_length
()
+
20
]
;
char
*
send_query
=
(
char
*
)
thd
->
alloc
(
thd
->
query_length
()
+
20
)
;
bool
partial_alter
=
false
;
/*
Why on global memory ?- So that SQLCOM_COMMIT_ALTER/ROLLBACK should not get
...
...
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