summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-02-09 13:59:41 +0100
committerunknown <monty@mysql.com>2004-02-09 13:59:41 +0100
commit74b81a801785058706b46a1e75b67b026c468d04 (patch)
tree8a4c27f40f9f6b198bd0c9b9b5a7bf3c49138f78 /strings
parent1c810278bd5e1d69f8612b047784e46b4ba7cd46 (diff)
downloadmariadb-git-74b81a801785058706b46a1e75b67b026c468d04.tar.gz
Ensure that result from date_format() is binary
Removed warnings from test suite mysql-test/r/ctype_utf8.result: Update results after fix of return argument from date_format() mysql-test/r/date_formats.result: Remove unnecessary warnings mysql-test/r/type_decimal.result: Remove unnecessary warnings mysql-test/r/warnings.result: Remove unnecessary warnings mysql-test/t/ctype_utf8.test: Fixed test mysql-test/t/date_formats.test: Remove unnecessary warnings mysql-test/t/type_decimal.test: Remove unnecessary warnings mysql-test/t/warnings.test: Remove unnecessary warnings sql/field.cc: Optimize sql/item_timefunc.cc: Ensure that result from date_format() is binary strings/ctype-simple.c: Better names for arguments
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index fb2dee99ba5..233251e16a8 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1021,11 +1021,11 @@ uint my_charpos_8bit(CHARSET_INFO *cs __attribute__((unused)),
}
uint my_wellformedlen_8bit(CHARSET_INFO *cs __attribute__((unused)),
- const char *b,
- const char *e,
+ const char *start,
+ const char *end,
uint nchars)
{
- uint nbytes= e-b;
+ uint nbytes= (uint) (end-start);
return nbytes < nchars ? nbytes : nchars;
}