diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2008-01-15 00:02:49 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2008-01-15 00:02:49 +0200 |
| commit | 5b18f8106c582d413cd609e472456e8dee382489 (patch) | |
| tree | 7519a6bf673cab9fc0a585dfd00bfcdd7238ca06 /storage | |
| parent | 50e278817f4ef609beb49e8b6288c78d24152e25 (diff) | |
| download | mariadb-git-5b18f8106c582d413cd609e472456e8dee382489.tar.gz | |
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
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_init.c | 3 | ||||
| -rw-r--r-- | storage/maria/ma_loghandler.c | 3 | ||||
| -rw-r--r-- | storage/maria/ma_static.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/storage/maria/ma_init.c b/storage/maria/ma_init.c index 7cc648ae259..2bdeb0024fe 100644 --- a/storage/maria/ma_init.c +++ b/storage/maria/ma_init.c @@ -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 diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 3a413380a07..99aede2be16 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -716,9 +716,6 @@ typedef struct st_translog_validator_data } TRANSLOG_VALIDATOR_DATA; -const char *maria_data_root; - - /* Check cursor/buffer consistence diff --git a/storage/maria/ma_static.c b/storage/maria/ma_static.c index 169dd7f1348..0af691b7333 100644 --- a/storage/maria/ma_static.c +++ b/storage/maria/ma_static.c @@ -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 |