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
c2854c78
Commit
c2854c78
authored
Oct 14, 2019
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
Data should be sent with length.
parent
ea61b796
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
2 deletions
+44
-2
mysql-test/r/processlist.result
mysql-test/r/processlist.result
+1
-0
mysql-test/r/processlist_MDEV-20466.result
mysql-test/r/processlist_MDEV-20466.result
+0
-0
mysql-test/t/processlist.test
mysql-test/t/processlist.test
+2
-0
mysql-test/t/processlist_MDEV-20466.test
mysql-test/t/processlist_MDEV-20466.test
+35
-0
sql/sql_show.cc
sql/sql_show.cc
+6
-2
No files found.
mysql-test/r/processlist.result
View file @
c2854c78
...
...
@@ -17,3 +17,4 @@ select command, time < 5 from information_schema.processlist where id != connect
command time < 5
Sleep 1
set debug_sync='reset';
End of 5.5 tests
mysql-test/r/processlist_MDEV-20466.result
0 → 100644
View file @
c2854c78
File added
mysql-test/t/processlist.test
View file @
c2854c78
...
...
@@ -50,3 +50,5 @@ select command, time < 5 from information_schema.processlist where id != connect
disconnect
con1
;
set
debug_sync
=
'reset'
;
--
echo
End
of
5.5
tests
mysql-test/t/processlist_MDEV-20466.test
0 → 100644
View file @
c2854c78
--
echo
# This test has a result that includes \0 byte.
--
echo
# Such a byte makes diff to treat the whole file as binary,
--
echo
# and to refuse to diff it.
--
echo
# That's why this test is put in a separate file,
--
echo
# so that diff would still work on results of other tests.
source
include
/
have_debug
.
inc
;
source
include
/
have_debug_sync
.
inc
;
--
echo
#
--
echo
# MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
--
echo
#
connect
(
con1
,
localhost
,
root
,,);
#select * from information_schema.processlist;
connection
con1
;
let
$q
=
`select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (3)")`
;
SET
DEBUG_SYNC
=
'before_join_optimize SIGNAL in_sync'
;
--
send_eval
$q
;
connection
default
;
SET
DEBUG_SYNC
=
'now WAIT_FOR in_sync'
;
--
replace_column
1
ID
3
HOST_NAME
6
TIME
9
TIME_MS
SHOW
PROCESSLIST
;
disconnect
con1
;
SET
DEBUG_SYNC
=
'RESET'
;
--
echo
End
of
5.5
tests
sql/sql_show.cc
View file @
c2854c78
...
...
@@ -2278,8 +2278,12 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
else
protocol
->
store_null
();
protocol
->
store
(
thd_info
->
state_info
,
system_charset_info
);
protocol
->
store
(
thd_info
->
query_string
.
str
(),
thd_info
->
query_string
.
charset
());
if
(
thd_info
->
query_string
.
length
())
protocol
->
store
(
thd_info
->
query_string
.
str
(),
thd_info
->
query_string
.
length
(),
thd_info
->
query_string
.
charset
());
else
protocol
->
store_null
();
if
(
!
thd
->
variables
.
old_mode
&&
!
(
thd
->
variables
.
old_behavior
&
OLD_MODE_NO_PROGRESS_INFO
))
protocol
->
store
(
thd_info
->
progress
,
3
,
&
store_buffer
);
...
...
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