diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-07-04 16:34:47 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-07-04 16:34:47 +0500 |
| commit | 2da84514197241f7ed9659abca9fe6460d50acd8 (patch) | |
| tree | 70ac9e05c16e9e3d55dcac3d259b1c0da3c6d55a /strings | |
| parent | 48782e344c4410ad05ac0a2244aff7c943aa3c39 (diff) | |
| parent | de82433c209d2fad6a17ff62ae91bb4cf4e86408 (diff) | |
| download | mariadb-git-2da84514197241f7ed9659abca9fe6460d50acd8.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b29499
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
strings/ctype-extra.c:
Auto merged
mysql-test/r/ctype_latin1.result:
After merge fix
mysql-test/t/ctype_latin1.test:
After merge fix
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-extra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c index 2b66989ed3e..96c7cb17d84 100644 --- a/strings/ctype-extra.c +++ b/strings/ctype-extra.c @@ -908,7 +908,7 @@ uint16 to_uni_ascii_general_ci[] = { 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067, 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F, 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077, -0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000, +0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -4589,7 +4589,7 @@ uint16 to_uni_ascii_bin[] = { 0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067, 0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F, 0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077, -0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x0000, +0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, |