summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-31 18:27:49 +0200
committerunknown <monty@hundin.mysql.fi>2001-10-31 18:27:49 +0200
commit03f6fdd575f71aacd4b6e782c9df4b929f8222b1 (patch)
tree603547f133fd6eaa7de511aeb171eb8224e0d208 /strings
parent3f7cf671a1d735a72e98e89d91a16cce085e6817 (diff)
downloadmariadb-git-03f6fdd575f71aacd4b6e782c9df4b929f8222b1.tar.gz
Portability fixes
Fix for consistent 0000-00-00 date handling Close + open binary logs on flush tables Fix for AVG() in HAVING. BUILD/SETUP.sh: Compile MySQL with -O0 to make debugging easier. Docs/manual.texi: Changelog configure.in: Version change innobase/buf/buf0lru.c: Fix for windows mysql-test/r/func_time.result: Updated tests mysql-test/r/having.result: Updated tests mysql-test/t/func_time.test: Updated tests mysql-test/t/having.test: Updated tests mysys/mf_casecnv.c: Portability fix mysys/mf_qsort.c: Portability fix mysys/my_compress.c: Portability fix mysys/my_tempnam.c: More comments sql/field.cc: Fix for consistent 0000-00-00 date handling sql/item.h: Fix for AVG() in HAVING sql/log.cc: Close + open update logs on flush tables sql/sql_select.cc: More debugging info sql/time.cc: Fix for consistent 0000-00-00 date handling strings/ctype.c: Portability fix strings/strto.c: Portability fix
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype.c2
-rw-r--r--strings/strto.c2
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. */