diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
| commit | e27c338634739ef56a6888e7948e04c0fa0ba677 (patch) | |
| tree | ad63ccae614f3dd77509825d1905fd815ef322cb /include | |
| parent | 2a5905141a3c509a7c34c3d370fb146dbc1c965f (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-e27c338634739ef56a6888e7948e04c0fa0ba677.tar.gz | |
5.5.38 merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/errmsg.h | 6 | ||||
| -rw-r--r-- | include/my_time.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index b839060a881..be4203b7f75 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -1,7 +1,7 @@ #ifndef ERRMSG_INCLUDED #define ERRMSG_INCLUDED -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,7 +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) client_errors[(X)-CR_MIN_ERROR] +#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \ + client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR]) + #endif #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ diff --git a/include/my_time.h b/include/my_time.h index 3c45d1d9235..557dcdd5670 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -125,7 +125,7 @@ longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut) ltime, flags, cut); } -int number_to_time(my_bool neg, longlong nr, ulong sec_part, +int number_to_time(my_bool neg, ulonglong nr, ulong sec_part, MYSQL_TIME *ltime, int *was_cut); ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *); |