From 5dd0515592e07e38681bfe53d4360884308a8d75 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Sep 2000 13:20:34 -0400 Subject: [PATCH 1/2] Don't remove the win1251 charset; mark it deprecated. configure.in: don't remove win1251, but mark it deprecated --- configure.in | 3 +- sql/share/charsets/Index | 2 + sql/share/charsets/win1251.conf | 82 +++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 sql/share/charsets/win1251.conf diff --git a/configure.in b/configure.in index a65580c9699..547b2417ec9 100644 --- a/configure.in +++ b/configure.in @@ -1524,7 +1524,8 @@ AC_ARG_WITH(charset, [ --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr - latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr +dnl win1251 is deprecated - it's available, but not listed here in the help + latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620; default is latin1)], [default_charset="$withval"], [default_charset="$DEFAULT_CHARSET"]) diff --git a/sql/share/charsets/Index b/sql/share/charsets/Index index 1d507f86e3e..f28ee87b396 100644 --- a/sql/share/charsets/Index +++ b/sql/share/charsets/Index @@ -19,6 +19,8 @@ sjis 13 cp1251 14 danish 15 hebrew 16 +# The win1251 character set is deprecated. Please use cp1251 instead. +win1251 17 tis620 18 euc_kr 19 estonia 20 diff --git a/sql/share/charsets/win1251.conf b/sql/share/charsets/win1251.conf new file mode 100644 index 00000000000..a5ccc3190ad --- /dev/null +++ b/sql/share/charsets/win1251.conf @@ -0,0 +1,82 @@ +# Configuration file for the win1251 character set + +# NOTE: this character set is deprecated. Please don't use it +# unless you must because of old tables. +# +# If you want to convert your files to charset cp1251, you can do: +# +# myisamchk -rq --set-character-set-name=cp1251 *.MYI + + +# ctype array (must have 257 elements) + 00 + 20 20 20 20 20 20 20 20 20 28 28 28 28 28 20 20 + 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 + 48 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 + 84 84 84 84 84 84 84 84 84 84 10 10 10 10 10 10 + 10 81 81 81 81 81 81 01 01 01 01 01 01 01 01 01 + 01 01 01 01 01 01 01 01 01 01 01 10 10 10 10 10 + 10 82 82 82 82 82 82 02 02 02 02 02 02 02 02 02 + 02 02 02 02 02 02 02 02 02 02 02 10 10 10 10 20 + 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 + 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 + 10 10 10 10 10 10 10 10 01 10 10 10 10 10 10 10 + 10 10 10 10 10 10 10 10 02 10 10 10 10 10 10 10 + 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 + 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 + 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 + 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 + +# to_lower array (must have 256 elements) + 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F + 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F + 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F + 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F + 40 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F + 70 71 72 73 74 75 76 77 78 79 7A 5B 5C 5D 5E 5F + 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F + 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E 7F + 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F + 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E 9F + A0 A1 A2 A3 A4 A5 A6 A7 B8 A9 AA AB AC AD AE AF + B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE BF + E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF + F0 F1 F2 F3 F4 F5 F5 F7 F8 F9 FA FB FC FD FE FF + E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF + F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF + +# to_upper array (must have 256 elements) + 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F + 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F + 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F + 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F + 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F + 50 51 52 53 54 55 56 57 58 59 5A 5B 5C 5D 5E 5F + 60 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F + 50 51 52 53 54 55 56 57 58 59 5A 7B 7C 7D 7E 7F + 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F + 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E 9F + A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF + B0 B1 B2 B3 B4 B5 B6 B7 A8 B9 BA BB BC BD BE BF + C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF + D0 D1 D2 D3 D4 D5 D5 D7 D8 D9 DA DB DC DD DE DF + C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF + D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE DF + +# sort_order array (must have 256 elements) + 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F + 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F + 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F + 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F + 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F + 50 51 52 53 54 55 56 57 58 59 5A 5B 5C 5D 5E 5F + 60 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F + 50 51 52 53 54 55 56 57 58 59 5A 7B 7C 7D 7E 7F + 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F + 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E 9F + A0 A1 A2 A3 A4 A5 A6 A7 C6 A9 AA AB AC AD AE AF + B0 B1 B2 B3 B4 B5 B6 B7 C6 B9 BA BB BC BD BE BF + C0 C1 C2 C3 C4 C5 C7 C8 C9 CA CB CC CD CE CF D0 + D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE DF E0 + C0 C1 C2 C3 C4 C5 C7 C8 C9 CA CB CC CD CE CF D0 + D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE DF E0 From 568f7100923ee245f8117cca655d042e64218137 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Sep 2000 13:37:52 -0400 Subject: [PATCH 2/2] manual.texi - win1251 is deprecated Docs/manual.texi: - win1251 is deprecated --- Docs/manual.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 2d7f6bc78f8..c907998e46d 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -4979,8 +4979,8 @@ shell> ./configure --with-charset=CHARSET @code{czech}, @code{danish},@code{dec8}, @code{dos}, @code{euc_kr}, @code{gb2312}, @code{gbk}, @code{german1}, @code{hebrew}, @code{hp8}, @code{hungarian}, @code{koi8_ru}, @code{koi8_ukr}, @code{latin1}, @code{latin2}, -@code{sjis}, @code{swe7}, @code{tis620}, @code{ujis}, @code{usa7}, -@code{win1251} or @code{win1251ukr}. +@code{sjis}, @code{swe7}, @code{tis620}, @code{ujis}, @code{usa7} or +@code{win1251ukr}. @xref{Character sets}. If you want to convert characters between the server and the client,