summaryrefslogtreecommitdiff
path: root/storage/connect/valblk.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-08-25 11:12:54 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-08-25 11:12:54 +0200
commitdd0872eb9cb1068da7f148865a2eab49955762a5 (patch)
treeb14b77e4b1f04d8010c3bbc27190928637a7147d /storage/connect/valblk.cpp
parent730bf6906b2bb87b3cab95949cdb0f8b080f04b1 (diff)
downloadmariadb-git-dd0872eb9cb1068da7f148865a2eab49955762a5.tar.gz
- Handle TINY in ODBC type conversion
modified: storage/connect/odbconn.cpp - Enhance TYPBLK<TYPE>::GetMaxLength modified: storage/connect/valblk.cpp
Diffstat (limited to 'storage/connect/valblk.cpp')
-rw-r--r--storage/connect/valblk.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
index 55f9da7571b..06c7776d2f5 100644
--- a/storage/connect/valblk.cpp
+++ b/storage/connect/valblk.cpp
@@ -447,13 +447,12 @@ int TYPBLK<TYPE>::Find(PVAL vp)
template <class TYPE>
int TYPBLK<TYPE>::GetMaxLength(void)
{
- char buf[12];
- int i, n;
+ char buf[32];
+ int i, n, m;
for (i = n = 0; i < Nval; i++) {
- sprintf(buf, Fmt, Typp[i]);
-
- n = max(n, (signed)strlen(buf));
+ m = sprintf(buf, Fmt, Typp[i]);
+ n = max(n, m);
} // endfor i
return n;