diff options
| author | unknown <monty@mysql.com> | 2003-12-26 12:32:24 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-26 12:32:24 +0200 |
| commit | 35fd38150acdbfedf8d1c7ca0db03953cbb21b8f (patch) | |
| tree | fc3516ac40155035b7af0243cedd3ac0743790ab /sql/slave.cc | |
| parent | d55382369eb639417dd01a62ff4867f9213f10ce (diff) | |
| parent | 3f4d396dc33a68252f8db838d14192186f4ce342 (diff) | |
| download | mariadb-git-35fd38150acdbfedf8d1c7ca0db03953cbb21b8f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
sql/slave.cc:
Auto merged
sql/sql_acl.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 8af38624df6..968293369a8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2682,7 +2682,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) rli->is_until_satisfied()) { sql_print_error("Slave SQL thread stopped because it reached its" - " UNTIL position"); + " UNTIL position %ld", (long) rli->until_pos()); /* Setting abort_slave flag because we do not want additional message about error in query execution to be printed. |