diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
| commit | 720906eec5432162d1c4335fbeefedb99a054498 (patch) | |
| tree | c3d2d1b1efe2de7e702c3d65d8b7bddccbdbd5d0 /sql/slave.cc | |
| parent | 5bc9b3d2cc4c930ce75ec82feba58f344e81d003 (diff) | |
| download | mariadb-git-720906eec5432162d1c4335fbeefedb99a054498.tar.gz | |
Merge from 5.0-bt
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index dd80b13ed46..33ce8c21963 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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)); |