mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

Browse source
This commit is contained in:
Davi Arnaut 2010-07-15 10:47:50 -03:00
commit 711c318c07
488 changed files with 12062 additions and 12285 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/daemon_example/daemon_example.cc
View file

@ -175,7 +175,7 @@ static int daemon_example_plugin_deinit(void *p)
my_write(con->heartbeat_file, (uchar*) buffer, strlen(buffer), MYF(0));
my_close(con->heartbeat_file, MYF(0));
my_free((char *)con, MYF(0));
my_free(con);
DBUG_RETURN(0);
}

2
plugin/semisync/semisync_master.h
View file

@ -255,7 +255,7 @@ private:
*/
void free_block(Block *block)
{
my_free(block, MYF(0));
my_free(block);
--block_num;
}