summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2010-03-29 18:42:49 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2010-03-29 18:42:49 +0500
commit6eca53f1d382a247456d29794c70338f972b77a9 (patch)
tree47bc6b7ea7cc56b58879c53e210f08825d58fd38
parentd4d5df0a3eaad6038be91a74f591b66ec4d245a3 (diff)
downloadmariadb-git-6eca53f1d382a247456d29794c70338f972b77a9.tar.gz
fixed compiler warning
-rw-r--r--sql/item_strfunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index aedc63164f2..ab2bf006032 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -695,7 +695,7 @@ public:
void fix_length_and_dec()
{
ulonglong max_result_length= (ulonglong) args[0]->max_length * 2 + 2;
- max_length= min(max_result_length, MAX_BLOB_WIDTH);
+ max_length= (uint32) min(max_result_length, MAX_BLOB_WIDTH);
collation.set(args[0]->collation);
}
};