diff options
| author | unknown <guilhem@mysql.com> | 2003-07-08 15:50:57 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-07-08 15:50:57 +0200 |
| commit | eed62d993d1355c5e84c0b0b17d417e84086c526 (patch) | |
| tree | d6d1b47fdfb1347291fbac6ff6ad5ebd8659687c /sql/log.cc | |
| parent | d0486f8abce9e241103acb33ac4f82f11e2b76c4 (diff) | |
| download | mariadb-git-eed62d993d1355c5e84c0b0b17d417e84086c526.tar.gz | |
Fix for
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
include/mysqld_error.h:
New error code (can be sent only to the slave thread, not to normal clients).
sql/log.cc:
removed comment from a previous debugging.
sql/log_event.cc:
ER_SLAVE_IGNORED_TABLE is an ignorable error.
sql/share/czech/errmsg.txt:
for BUG#797
sql/share/danish/errmsg.txt:
for BUG#797
sql/share/dutch/errmsg.txt:
for BUG#797
sql/share/english/errmsg.txt:
for BUG#797
sql/share/estonian/errmsg.txt:
for BUG#797
sql/share/french/errmsg.txt:
for BUG#797
sql/share/german/errmsg.txt:
for BUG#797
sql/share/greek/errmsg.txt:
for BUG#797
sql/share/hungarian/errmsg.txt:
for BUG#797
sql/share/italian/errmsg.txt:
for BUG#797
sql/share/japanese/errmsg.txt:
for BUG#797
sql/share/korean/errmsg.txt:
for BUG#797
sql/share/norwegian-ny/errmsg.txt:
for BUG#797
sql/share/norwegian/errmsg.txt:
for BUG#797
sql/share/polish/errmsg.txt:
for BUG#797
sql/share/portuguese/errmsg.txt:
for BUG#797
sql/share/romanian/errmsg.txt:
for BUG#797
sql/share/russian/errmsg.txt:
for BUG#797
sql/share/slovak/errmsg.txt:
for BUG#797
sql/share/spanish/errmsg.txt:
for BUG#797
sql/share/swedish/errmsg.txt:
for BUG#797
sql/share/ukrainian/errmsg.txt:
for BUG#797
sql/sql_parse.cc:
when in sql_parse in the slave thread we ignore the query because of replicate-do
and replicate-ignore options, we return a specific error to the slave thread,
so that it knows that the query has been ignored (which is different from a
successful query).
A small cleanup (test was done twice).
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/log.cc b/sql/log.cc index ef7cdd0dbd5..7bcdc12ddf1 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -875,14 +875,9 @@ void MYSQL_LOG::new_file(bool need_lock) save_log_type=log_type; name=0; // Don't free name close(); -/* - if (save_log_type == LOG_BIN) - { - printf("after close, before open; I wait for 20 seconds\n"); - sleep(20); - printf("sleep finished, opening\n"); - } -*/ + + // TODO: at this place is_open() will see the log closed, which is BUG#791. + open(old_name, save_log_type, new_name_ptr, index_file_name, io_cache_type, no_auto_events, max_size); my_free(old_name,MYF(0)); |