diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
| commit | efe619585840b27ef156b35f2be6ef3c9809d2e5 (patch) | |
| tree | fa68ffcd1dbdaf248e483a5692358fe7330ec507 /strings | |
| parent | a1218bb782f646111c9302740b4c443e3fed6d88 (diff) | |
| parent | 8f32ccff6032e03782ad805b97328f2e5e047384 (diff) | |
| download | mariadb-git-efe619585840b27ef156b35f2be6ef3c9809d2e5.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index f030c08523c..069131ba354 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1602,16 +1602,6 @@ fill_max_and_min: *min_str++= *max_str++ = ptr[1]; } - /* Temporary fix for handling w_one at end of string (key compression) */ - { - char *tmp; - for (tmp= min_str ; tmp-1 > min_org && tmp[-1] == '\0' && tmp[-2]=='\0';) - { - *--tmp=' '; - *--tmp='\0'; - } - } - *min_length= *max_length = (size_t) (min_str - min_org); while (min_str + 1 < min_end) { |