diff options
| author | unknown <monty@work.mysql.com> | 2001-10-07 12:26:03 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-07 12:26:03 +0200 |
| commit | d0fe5ce1c7f4297787b2b2f49263fe1ae18d0157 (patch) | |
| tree | 1fb3f8782944fd32e9141416f7c678430bb80846 /sql/slave.cc | |
| parent | c965463333e3bd92697d18ad1d20eded92b1c463 (diff) | |
| parent | 9def70036f82bc3d9338b1584226451bbe88ab96 (diff) | |
| download | mariadb-git-d0fe5ce1c7f4297787b2b2f49263fe1ae18d0157.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/rpl000017.test:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 23475f3b1e8..d2e038bef88 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -925,7 +925,7 @@ point. If you are sure that your master is ok, run this query manually on the\ slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\ SLAVE START;", thd->query); last_slave_errno = expected_error; - sql_print_error(last_slave_error); + sql_print_error("%s",last_slave_error); return 1; default: return 0; |