diff options
| author | monty@hundin.mysql.fi <> | 2001-10-31 18:27:49 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-31 18:27:49 +0200 |
| commit | d89690e606d38e5b0f1d82117cd26a5264325088 (patch) | |
| tree | 603547f133fd6eaa7de511aeb171eb8224e0d208 /strings | |
| parent | c9e4b2aab32a5d27336a4a2595ee20b3c4ff019d (diff) | |
| download | mariadb-git-d89690e606d38e5b0f1d82117cd26a5264325088.tar.gz | |
Portability fixes
Fix for consistent 0000-00-00 date handling
Close + open binary logs on flush tables
Fix for AVG() in HAVING.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype.c | 2 | ||||
| -rw-r--r-- | strings/strto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype.c b/strings/ctype.c index d6f02ec5054..e66c9771d78 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -16,8 +16,8 @@ MA 02111-1307, USA */ #include <global.h> - #include <m_ctype.h> +#include <m_string.h> /* generated by make, using conf_to_src */ #include "ctype_extra_sources.c" diff --git a/strings/strto.c b/strings/strto.c index 64b1c9a5ae9..d3392c794e9 100644 --- a/strings/strto.c +++ b/strings/strto.c @@ -197,7 +197,7 @@ function (const char *nptr,char **endptr,int base) } /* Return the result of the appropriate sign. */ - return (negative ? -((longtype) i) : i); + return (negative ? -((longtype) i) : (longtype) i); noconv: /* There was no number to convert. */ |