diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-21 12:55:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-21 12:55:43 -0400 |
| commit | a6113078116ca73dcc664706a54ca6cbe794892a (patch) | |
| tree | 6f68965e9dd6efe44e40c421d09f8af33543bd7a /sql/slave.cc | |
| parent | 524914b2170927aa0b1d95b63d229ac0e11fc092 (diff) | |
| parent | b2cfa703f4799e68bc41dd651e30d4057b5c7076 (diff) | |
| download | mariadb-git-a6113078116ca73dcc664706a54ca6cbe794892a.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/t/func_time.test:
Manual merge.
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 84d97242bf3..f9645fc83e3 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3051,7 +3051,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) rli->is_until_satisfied()) { char buf[22]; - sql_print_error("Slave SQL thread stopped because it reached its" + sql_print_information("Slave SQL thread stopped because it reached its" " UNTIL position %s", llstr(rli->until_pos(), buf)); /* Setting abort_slave flag because we do not want additional message about |