Commit 5b18f810 authored by unknown's avatar unknown

Moved variables to ma_static.c to avoid link error on MacOSX

Added suppress rule for dlclose() in valgrind.supp


mysql-test/valgrind.supp:
  Removed duplication
  Added error in dlclose() noticed on pushbuild for x86_64
storage/maria/ma_init.c:
  Moved variables to ma_static.c to avoid link error on MacOSX
storage/maria/ma_loghandler.c:
  Moved variables to ma_static.c to avoid link error on MacOSX
storage/maria/ma_static.c:
  Moved variables to ma_static.c to avoid link error on MacOSX
parent 50e27881
......@@ -267,18 +267,6 @@
fun:_dl_relocate_object
}
#
# Warning from my_thread_init becasue mysqld dies before kill thread exists
#
{
my_thread_init kill thread memory loss second
Memcheck:Leak
fun:calloc
fun:my_thread_init
fun:kill_server_thread
}
#
# Leaks reported in _dl_* internal functions on Linux amd64 / glibc2.3.2.
#
......@@ -372,6 +360,16 @@
fun:__libc_start_main
}
{
dlclose memory loss from udf_free
Memcheck:Leak
fun:calloc
fun:_dlerror_run
fun:dlclose
fun:_Z8udf_freev
}
#
# These seem to be libc threading stuff, not related to MySQL code (allocations
# during pthread_exit()). Googling shows other projects also using these
......@@ -469,6 +467,8 @@
fun:_ZN19TransporterRegistry11performSendEv
fun:_ZN19TransporterRegistry14forceSendCheckEi
}
#
# Warning when printing stack trace (to suppress some not needed warnings)
#
......
......@@ -21,9 +21,6 @@
#include "trnman_public.h"
#include "ma_checkpoint.h"
my_bool maria_inited= FALSE;
pthread_mutex_t THR_LOCK_maria;
/*
Initialize maria
......
......@@ -716,9 +716,6 @@ typedef struct st_translog_validator_data
} TRANSLOG_VALIDATOR_DATA;
const char *maria_data_root;
/*
Check cursor/buffer consistence
......
......@@ -34,6 +34,8 @@ uint maria_quick_table_bits=9;
ulong maria_block_size= MARIA_KEY_BLOCK_LENGTH;
my_bool maria_flush= 0, maria_single_user= 0;
my_bool maria_delay_key_write= 0, maria_page_checksums= 1;
my_bool maria_inited= FALSE;
pthread_mutex_t THR_LOCK_maria;
#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS)
ulong maria_concurrent_insert= 2;
#else
......@@ -49,6 +51,7 @@ PAGECACHE *maria_pagecache= &maria_pagecache_var;
PAGECACHE maria_log_pagecache_var;
PAGECACHE *maria_log_pagecache= &maria_log_pagecache_var;
MY_TMPDIR *maria_tmpdir; /* Tempdir for redo */
const char *maria_data_root;
/**
@brief when transactionality does not matter we can use this transaction
......
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