summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-08-12 15:28:36 +0200
committerunknown <serg@serg.mylan>2003-08-12 15:28:36 +0200
commit8e6ff087df86b76a50cb35222c7a27871eb784f6 (patch)
treefa052b00efeba3921add8ced645f8c6d74b0f86b
parent8d816967531e4399d7ff3c5fd1b7c2234f5801b5 (diff)
downloadmariadb-git-8e6ff087df86b76a50cb35222c7a27871eb784f6.tar.gz
snprintf compatibility fix
-rw-r--r--myisam/ft_dump.c4
-rw-r--r--sql/field.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c
index d95e719e234..69fef529fa9 100644
--- a/myisam/ft_dump.c
+++ b/myisam/ft_dump.c
@@ -130,7 +130,11 @@ int main(int argc,char *argv[])
#error
#endif
+#ifdef HAVE_SNPRINTF
snprintf(buf,MAX_LEN,"%.*s",(int) keylen,info->lastkey+1);
+#else
+ sprintf(buf,"%.*s",(int) keylen,info->lastkey+1);
+#endif
casedn_str(buf);
total++;
lengths[keylen]++;
diff --git a/sql/field.cc b/sql/field.cc
index 9babe069300..e56d53b1bda 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -742,7 +742,7 @@ void Field_decimal::store(double nr)
char buff[320];
fyllchar = zerofill ? (char) '0' : (char) ' ';
-#ifdef HAVE_SNPRINTF_
+#ifdef HAVE_SNPRINTF
buff[sizeof(buff)-1]=0; // Safety
snprintf(buff,sizeof(buff)-1, "%.*f",(int) dec,nr);
#else