diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-31 13:58:33 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-31 13:58:33 -0600 |
| commit | 14dba1af96b96f4954c1197e64831f56ba5fa7b7 (patch) | |
| tree | 75390eef53d99f5b485d3846caaba60503747442 | |
| parent | a9642208bc0ff280f987cb2dbc0935145d9c947c (diff) | |
| parent | 18da1d3f31c98404b57a653bf593857169835c3c (diff) | |
| download | mariadb-git-14dba1af96b96f4954c1197e64831f56ba5fa7b7.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/slave.cc | 7 | ||||
| -rw-r--r-- | sql/unireg.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f4888a3c6c6..ef8ceced1d3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,3 +2,4 @@ jani@janikt.pp.saunalahti.fi monty@hundin.mysql.fi mwagner@evoq.mwagner.org heikki@donna.mysql.fi +sasha@mysql.sashanet.com 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; } diff --git a/sql/unireg.h b/sql/unireg.h index 7ad3bac2eab..87529dd1f69 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -37,7 +37,8 @@ #define SHAREDIR "share/" #endif -#define ER(X) errmesg[(X)-1000] +#define ER(X) ((X) >= 1000 && (X) < ER_ERROR_MESSAGES + 1000) ? \ + errmesg[(X)-1000] : "Invalid error code" #define ERRMAPP 1 /* Errormap f|r my_error */ #define LIBLEN FN_REFLEN-FN_LEN /* Max l{ngd p} dev */ |