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
ec0fb660
Commit
ec0fb660
authored
Mar 21, 2016
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-9058: protocol: COM_MULTI command (post-post-review changes)
Now we do not swap buffers back but just free old one.
parent
0c9d39ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
sql/sql_parse.cc
sql/sql_parse.cc
+2
-7
No files found.
sql/sql_parse.cc
View file @
ec0fb660
...
@@ -2230,7 +2230,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
...
@@ -2230,7 +2230,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
/* We have to store next length because it will be destroyed by '\0' */
/* We have to store next length because it will be destroyed by '\0' */
uint
next_subpacket_length
=
uint3korr
(
packet
);
uint
next_subpacket_length
=
uint3korr
(
packet
);
unsigned
char
*
readbuff
=
net
->
buff
;
unsigned
char
*
readbuff
=
net
->
buff
;
unsigned
long
readbuff_max_packet
=
net
->
max_packet
;
if
(
net_allocate_new_packet
(
net
,
thd
,
MYF
(
0
)))
if
(
net_allocate_new_packet
(
net
,
thd
,
MYF
(
0
)))
break
;
break
;
...
@@ -2266,13 +2265,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
...
@@ -2266,13 +2265,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
}
com_multi_end:
com_multi_end:
/* re
store buffer to the original one
*/
/* re
lease old buffer
*/
DBUG_ASSERT
(
net
->
buff
==
net
->
write_pos
);
// nothing to send
DBUG_ASSERT
(
net
->
buff
==
net
->
write_pos
);
// nothing to send
my_free
(
net
->
buff
);
my_free
(
readbuff
);
net
->
buff
=
readbuff
;
net
->
max_packet
=
readbuff_max_packet
;
net
->
buff_end
=
net
->
buff
+
net
->
max_packet
;
net
->
write_pos
=
net
->
read_pos
=
net
->
buff
;
}
}
break
;
break
;
}
}
...
...
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