database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Bug #32124 addendum #2

Browse Source 
- fixed an unitialized memory read
 - fixed a compilation warning
 - added a suppression for FC9 x86_64
This commit is contained in:
Georgi Kodinov
2008-10-10 12:52:23 +03:00
parent a8c96e6891
commit ac0027ae0c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/valgrind.supp
View File

@@ -444,6 +444,15 @@
fun:_dl_open
}
{
libc pthread_exit 8
Memcheck:Leak
fun:malloc
fun:local_strdup
fun:_dl_map_object
fun:dl_open_worker
}
#
# This is seen internally in the system libraries on 64-bit RHAS3.
#

8
sql/item_func.cc
View File

@@ -4935,7 +4935,7 @@ longlong Item_func_get_system_var::val_int()
{
THD *thd= current_thd;
if (thd->query_id == used_query_id)
if (cache_present && thd->query_id == used_query_id)
{
if (cache_present & GET_SYS_VAR_CACHE_LONG)
{
@@ -5011,7 +5011,7 @@ String* Item_func_get_system_var::val_str(String* str)
{
THD *thd= current_thd;
if (thd->query_id == used_query_id)
if (cache_present && thd->query_id == used_query_id)
{
if (cache_present & GET_SYS_VAR_CACHE_STRING)
{
@@ -5091,7 +5091,7 @@ double Item_func_get_system_var::val_real()
{
THD *thd= current_thd;
if (thd->query_id == used_query_id)
if (cache_present && thd->query_id == used_query_id)
{
if (cache_present & GET_SYS_VAR_CACHE_DOUBLE)
{
@@ -5189,7 +5189,7 @@ bool Item_func_get_system_var::eq(const Item *item, bool binary_cmp) const
void Item_func_get_system_var::cleanup()
{
Item_func::cleanup();
cache_present= NULL;
cache_present= 0;
var_type= orig_var_type;
cached_strval.free();
}