diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-31 13:56:57 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-31 13:56:57 -0600 |
| commit | 18da1d3f31c98404b57a653bf593857169835c3c (patch) | |
| tree | b8da1ac8fb4a3e3ad24ad51faa730be16a253d20 /sql/slave.cc | |
| parent | 714640bfb9f725f05567c58fac34612e3e99df33 (diff) | |
| download | mariadb-git-18da1d3f31c98404b57a653bf593857169835c3c.tar.gz | |
deal with errno out of range when reading it from the master
sql/slave.cc:
print expected error number
sql/unireg.h:
sanity check for errno range in ER(X)
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 6b9c376a625..feed21d90be 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -916,9 +916,10 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) (actual_error = thd->net.last_errno) && expected_error) { const char* errmsg = "Slave: did not get the expected error\ - running query from master - expected: '%s', got '%s'"; - sql_print_error(errmsg, ER(expected_error), - actual_error ? thd->net.last_error:"no error" + running query from master - expected: '%s'(%d), got '%s'(%d)"; + sql_print_error(errmsg, ER(expected_error), expected_error, + actual_error ? thd->net.last_error:"no error", + actual_error ); thd->query_error = 1; } |