diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /plugin/semisync | |
| parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'plugin/semisync')
| -rw-r--r-- | plugin/semisync/semisync_master.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/semisync/semisync_master.h b/plugin/semisync/semisync_master.h index 1a562e8bb77..dfadf85f271 100644 --- a/plugin/semisync/semisync_master.h +++ b/plugin/semisync/semisync_master.h @@ -255,7 +255,7 @@ private: */ void free_block(Block *block) { - my_free(block, MYF(0)); + my_free(block); --block_num; } |