diff options
| author | sasha@mysql.sashanet.com <> | 2002-03-15 18:44:44 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-03-15 18:44:44 -0700 |
| commit | 2e6b48afd31008809439900db2d577ea0ff9d90f (patch) | |
| tree | fd01da1dc4d0055ee7386fa88268c65589a33c64 /sql/log_event.cc | |
| parent | d993a1c0c49ab200203993a8b20fb5ab02b930e2 (diff) | |
| download | mariadb-git-2e6b48afd31008809439900db2d577ea0ff9d90f.tar.gz | |
replication updates and bugfixes. Still not perfect - there is some strange
memory corruption I can only repeat on one system.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 528110deb74..8db10a84661 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1607,7 +1607,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) { mysql_parse(thd, thd->query, q_len); if (expected_error != - (actual_error = thd->net.last_errno) && expected_error) + (actual_error = thd->net.last_errno) && expected_error && + !ignored_error_code(actual_error)) { const char* errmsg = "Slave: did not get the expected error\ running query from master - expected: '%s' (%d), got '%s' (%d)"; |