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
6976bb94
Commit
6976bb94
authored
Feb 20, 2021
by
Nayuta Yanagisawa
Committed by
Sergei Golubchik
Mar 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
Add missing DBUG_RETURN to my_malloc.
parent
8d714db6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
mysql-test/main/query_cache.result
mysql-test/main/query_cache.result
+6
-0
mysql-test/main/query_cache.test
mysql-test/main/query_cache.test
+5
-0
mysys/my_malloc.c
mysys/my_malloc.c
+1
-1
No files found.
mysql-test/main/query_cache.result
View file @
6976bb94
...
@@ -2207,6 +2207,12 @@ Variable_name Value
...
@@ -2207,6 +2207,12 @@ Variable_name Value
Qcache_queries_in_cache 0
Qcache_queries_in_cache 0
DROP FUNCTION foo;
DROP FUNCTION foo;
drop table t1;
drop table t1;
#
# MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
#
set global Query_cache_size=18446744073709547520;
Warnings:
Warning 1282 Query cache failed to set size 18446744073709547520; new query cache size is 0
restore defaults
restore defaults
SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_size=@save_query_cache_size;
SET GLOBAL query_cache_size=@save_query_cache_size;
mysql-test/main/query_cache.test
View file @
6976bb94
...
@@ -1800,6 +1800,11 @@ show status like "Qcache_queries_in_cache";
...
@@ -1800,6 +1800,11 @@ show status like "Qcache_queries_in_cache";
DROP
FUNCTION
foo
;
DROP
FUNCTION
foo
;
drop
table
t1
;
drop
table
t1
;
--
echo
#
--
echo
# MDEV-24858 SIGABRT in DbugExit from my_malloc in Query_cache::init_cache Regression
--
echo
#
set
global
Query_cache_size
=
18446744073709547520
;
--
echo
restore
defaults
--
echo
restore
defaults
SET
GLOBAL
query_cache_type
=
default
;
SET
GLOBAL
query_cache_type
=
default
;
SET
GLOBAL
query_cache_size
=@
save_query_cache_size
;
SET
GLOBAL
query_cache_size
=@
save_query_cache_size
;
mysys/my_malloc.c
View file @
6976bb94
...
@@ -79,7 +79,7 @@ void *my_malloc(PSI_memory_key key, size_t size, myf my_flags)
...
@@ -79,7 +79,7 @@ void *my_malloc(PSI_memory_key key, size_t size, myf my_flags)
if
(
!
size
)
if
(
!
size
)
size
=
1
;
size
=
1
;
if
(
size
>
SIZE_T_MAX
-
1024L
*
1024L
*
16L
)
/* Wrong call */
if
(
size
>
SIZE_T_MAX
-
1024L
*
1024L
*
16L
)
/* Wrong call */
return
0
;
DBUG_RETURN
(
0
)
;
/* We have to align size as we store MY_THREAD_SPECIFIC flag in the LSB */
/* We have to align size as we store MY_THREAD_SPECIFIC flag in the LSB */
size
=
ALIGN_SIZE
(
size
);
size
=
ALIGN_SIZE
(
size
);
...
...
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