diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-05-31 12:10:37 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-05-31 12:10:37 +0500 |
| commit | 7dacbd701d1cbddaea16cd31ed0b030561b8af15 (patch) | |
| tree | f915de7bec4835640139570ecb836c1472597350 /strings | |
| parent | fec3d7c6aea43070d85bae207f45da02c186db70 (diff) | |
| parent | c7dfc326d420409b794a81837ec1da5c13df24eb (diff) | |
| download | mariadb-git-7dacbd701d1cbddaea16cd31ed0b030561b8af15.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into mysql.com:/home/bar/mysql-5.1.b28600
sql/field.cc:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ujis.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index d1e11071886..55454cbe7ed 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -264,18 +264,6 @@ my_wc_mb_jisx0201(CHARSET_INFO *cs __attribute__((unused)), return 1; } - if (wc == 0x00A5) - { - *s = 0x5C; - return 1; - } - - if (wc == 0x203E) - { - *s = 0x7E; - return 1; - } - return MY_CS_ILUNI; } |