diff options
| author | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
| commit | daaeeedb499cd27ff0279d8321808cdbccdd7e09 (patch) | |
| tree | d9fcf7c0806dd22a5d3dc0996b6c7b4ff240cbb9 /strings | |
| parent | 80b474bfc0c77ae2a4b477b15ac6681b05d33e6d (diff) | |
| parent | 92895d00527f62a57ed569f85df01dbf4f0db9c3 (diff) | |
| download | mariadb-git-daaeeedb499cd27ff0279d8321808cdbccdd7e09.tar.gz | |
Merged from 4.1
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.h:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/grant2.result:
Hand-merged new test
mysql-test/t/grant2.test:
Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
Used 5.0 version per tomas
sql/sql_acl.cc:
Merge fix for Bug #3309.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-win1250ch.c | 2 |
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] \ |