summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-03-03 15:01:46 -0800
committerjimw@mysql.com <>2005-03-03 15:01:46 -0800
commitf7c01cfb76fa4284973a34ee03a9c2f71359dae0 (patch)
treed9fcf7c0806dd22a5d3dc0996b6c7b4ff240cbb9 /strings
parent18f13a24a2890e610e868ebfc7e04397b78d6e85 (diff)
parent96e034f50e49068dd2391ef12f94cb40dcee7b1b (diff)
downloadmariadb-git-f7c01cfb76fa4284973a34ee03a9c2f71359dae0.tar.gz
Merged from 4.1
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-win1250ch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 37611a5bd20..8c58520f965 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -416,7 +416,7 @@ static struct wordvalue doubles[] = {
#define NEXT_CMP_VALUE(src, p, pass, value, len) \
while (1) { \
if (IS_END(p, src, len)) { \
- if (pass == 0) { p = src; pass++; } \
+ if (pass == 0 && len > 0) { p= src; pass++; } \
else { value = 0; break; } \
} \
value = ((pass == 0) ? _sort_order_win1250ch1[*p] \