Commit feb051be authored by Georgi Kodinov's avatar Georgi Kodinov

Bug #32124 addendum #2

 - fixed an unitialized memory read
 - fixed a compilation warning
 - added a suppression for FC9 x86_64

mysql-test/valgrind.supp:
  Bug #3214: added a suppression for FC9 x86_64
sql/item_func.cc:
  Bug #32124
   - fixed an unitialized memory read
   - fixed a compilation warning
parent 486a0d7e
...@@ -444,6 +444,15 @@ ...@@ -444,6 +444,15 @@
fun:_dl_open 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. # This is seen internally in the system libraries on 64-bit RHAS3.
# #
......
...@@ -4935,7 +4935,7 @@ longlong Item_func_get_system_var::val_int() ...@@ -4935,7 +4935,7 @@ longlong Item_func_get_system_var::val_int()
{ {
THD *thd= current_thd; 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) if (cache_present & GET_SYS_VAR_CACHE_LONG)
{ {
...@@ -5011,7 +5011,7 @@ String* Item_func_get_system_var::val_str(String* str) ...@@ -5011,7 +5011,7 @@ String* Item_func_get_system_var::val_str(String* str)
{ {
THD *thd= current_thd; 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) if (cache_present & GET_SYS_VAR_CACHE_STRING)
{ {
...@@ -5091,7 +5091,7 @@ double Item_func_get_system_var::val_real() ...@@ -5091,7 +5091,7 @@ double Item_func_get_system_var::val_real()
{ {
THD *thd= current_thd; 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) 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 ...@@ -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() void Item_func_get_system_var::cleanup()
{ {
Item_func::cleanup(); Item_func::cleanup();
cache_present= NULL; cache_present= 0;
var_type= orig_var_type; var_type= orig_var_type;
cached_strval.free(); cached_strval.free();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment