database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge from 5.0-bt

Browse Source
This commit is contained in:
Staale Smedseng
2009-06-29 15:17:01 +02:00
parent 5e0c653f03
commit 19dfaa5824
40 changed files with 254 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/slave.cc
View File

@ -1435,7 +1435,7 @@ static int get_master_version_and_clock(MYSQL* mysql, MASTER_INFO* mi)
if (errmsg)
{
sql_print_error(errmsg);
sql_print_error("%s", errmsg);
return 1;
}
@ -1558,7 +1558,7 @@ be equal for replication to work";
err:
if (errmsg)
{
sql_print_error(errmsg);
sql_print_error("%s", errmsg);
return 1;
}
@ -1968,7 +1968,7 @@ Failed to open the existing relay log info file '%s' (errno %d)",
DBUG_RETURN(error);
err:
sql_print_error(msg);
sql_print_error("%s", msg);
end_io_cache(&rli->info_file);
if (info_fd >= 0)
my_close(info_fd, MYF(0));