diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
| commit | 9b4a179d69a1c795bef303a88f9d3195669f00ec (patch) | |
| tree | 87811d81af231e2945468ead0cba58cfc5514548 /include/errmsg.h | |
| parent | 020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff) | |
| parent | 7db489fc7dea2b4c236807035e57f169074c6682 (diff) | |
| download | mariadb-git-10.3-merge.tar.gz | |
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'include/errmsg.h')
| -rw-r--r-- | include/errmsg.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index c0c4cfc58be..bd086bba05b 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -36,8 +36,9 @@ extern const char *client_errors[]; /* Error messages */ #define CR_MIN_ERROR 2000 /* For easier client code */ #define CR_MAX_ERROR 2999 #if !defined(ER) -#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \ - client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR]) +#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST) \ + ? client_errors[(X)-CR_ERROR_FIRST] \ + : client_errors[CR_UNKNOWN_ERROR-CR_ERROR_FIRST]) #endif #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ |