diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 5f0c09dd7220b7ad5709823788e9289fc94ab8fe (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /strings | |
| parent | 5194074be762f169fcc25b9ad0d4013905ba0655 (diff) | |
| parent | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (diff) | |
| download | mariadb-git-5f0c09dd7220b7ad5709823788e9289fc94ab8fe.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
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) { |