diff options
| author | bar@mysql.com <> | 2006-04-19 09:50:17 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2006-04-19 09:50:17 +0500 |
| commit | cedafc30e8aef787333334e3a373f6ae04c19545 (patch) | |
| tree | a8da81c2998f482b08415ac5acd71eabbb45403c /strings | |
| parent | a3a4ba937e5b091d0773506d73c757ca260679d6 (diff) | |
| parent | e8e0d5c5fefa34b6d1aa10befc82564ae60a939b (diff) | |
| download | mariadb-git-cedafc30e8aef787333334e3a373f6ae04c19545.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index e3bba3ee1e3..1a952a07042 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -3943,6 +3943,11 @@ my_mb_wc_filename(CHARSET_INFO *cs __attribute__((unused)), *pwc= touni[code]; return 3; } + if (byte1 == '@' && byte2 == '@') + { + *pwc= 0; + return 3; + } } if (s + 4 > e) |