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 /sql/share | |
| 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 'sql/share')
| -rw-r--r-- | sql/share/charsets/ascii.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml index 97006c53680..068fb84eeae 100644 --- a/sql/share/charsets/ascii.xml +++ b/sql/share/charsets/ascii.xml @@ -97,7 +97,7 @@ 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 004A 004B 004C 004D 004E 004F 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F -0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 0000 +0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 |