diff options
| author | Monty <monty@mariadb.org> | 2016-04-28 17:15:38 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-28 17:15:38 +0300 |
| commit | 636bb59034fd13d2e1b27af42adbb01ddeb3bd82 (patch) | |
| tree | 476c6baee07e742b5c50a2786e1246f29b1a63cb /sql/rpl_gtid.cc | |
| parent | 32d3d9f7dffa8ef96e6268b53f35453da2f6484d (diff) | |
| download | mariadb-git-636bb59034fd13d2e1b27af42adbb01ddeb3bd82.tar.gz | |
Final fixes for Memory_used
- Change some static variables to dynamic to ensure that we don't do any memory
allocations before server starts or stops
- Print more memory information on SIGHUP. Fixed output.
- Write out if memory was lost if run with --debug-at-exit
- Fixed wrong #ifdef in sql_cache.cc
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index f54ef2b0081..5a94e1c5b54 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -1127,7 +1127,7 @@ rpl_slave_state::is_empty() } -rpl_binlog_state::rpl_binlog_state() +void rpl_binlog_state::init() { my_hash_init(&hash, &my_charset_bin, 32, offsetof(element, domain_id), sizeof(uint32), NULL, my_free, HASH_UNIQUE); @@ -1137,7 +1137,6 @@ rpl_binlog_state::rpl_binlog_state() initialized= 1; } - void rpl_binlog_state::reset_nolock() { |