diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
| commit | 6630d2e18ca89fb35fa87aea09784dad55822d29 (patch) | |
| tree | b69f6a865d08077895e9ab32d8392e140da59380 /sql/share | |
| parent | cfc420976ec6739ebea4e09518dac4f79c693104 (diff) | |
| parent | 4020e6a2d7910be74c0f22e884c6f4ee8ba7865b (diff) | |
| download | mariadb-git-6630d2e18ca89fb35fa87aea09784dad55822d29.tar.gz | |
Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl
into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
BitKeeper/deleted/.del-binlog_killed_simulate.result:
Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_user.result:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
BitKeeper/deleted/.del-show_binary_logs.inc:
Delete: mysql-test/include/show_binary_logs.inc
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
manual merge ul.
mysql-test/extra/binlog_tests/blackhole.test:
manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
manual merge
sql/log.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_class.cc:
manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 7990baa6bb7..3e12cbf4f22 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6120,3 +6120,5 @@ ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT eng "The BINLOG statement of type `%s` was not preceded by a format description BINLOG statement." ER_SLAVE_CORRUPT_EVENT eng "Corrupted replication event was detected" +ER_LOG_PURGE_NO_FILE + eng "Being purged log %s was not found" |