mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-4.1/

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
unknown 2003-08-19 11:07:57 +02:00
commit 1e4b664311
15 changed files with 158 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BUILD/compile-pentium-maintainer Executable file
View file

@ -0,0 +1,13 @@
#! /bin/sh
path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs "
extra_configs="$extra_configs --enable-maintainer-mode"
. "$path/FINISH.sh"

2
include/m_ctype.h
View file

@ -79,7 +79,7 @@ enum my_lex_states
{
MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT,
MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
MY_LEX_FOUND_IDENT, MY_LEX_SIGNED_NUMBER, MY_LEX_REAL, MY_LEX_HEX_NUMBER,
MY_LEX_FOUND_IDENT, MY_LEX_REAL, MY_LEX_HEX_NUMBER,
MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,

9
sql/share/charsets/Index.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding="utf-8"?>
<charsets max-id="91">
<charsets max-id="93">
<description>
This file lists all of the available character sets.
@ -522,6 +522,13 @@ To make maintaining easier please:
</collation>
</charset>
<charset name="geostd8">
<family>South Asian</family>
<description>GEOSTD8 Georgian</description>
<collation name="geostd8_general_ci" id="92" order="Georgian" flag="primary"/>
<collation name="geostd8_bin" id="93" order="Binary" flag="binary"/>
</charset>
<charset name="binary">
<description>Binary pseudo charset</description>
<collation name="binary" id="63" order="Binary">

121
sql/share/charsets/geostd8.xml Normal file
View file

@ -0,0 +1,121 @@
<?xml version='1.0' encoding="utf-8"?>
<charsets>
<charset name="geostd8">
<ctype>
<map>
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
00 00 10 00 10 10 10 10 00 10 00 10 00 00 00 00
00 10 10 10 10 10 10 10 00 00 00 10 00 00 00 00
48 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03
03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03
03 03 03 03 03 03 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
</map>
</ctype>
<lower>
<map>
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 A8 A9 AA AB AC AD AE AF
B0 B1 B2 B3 B4 B5 B6 B7 B8 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 D6 D7 D8 D9 DA DB DC DD DE DF
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
</map>
</lower>
<upper>
<map>
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 B8 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 D6 D7 D8 D9 DA DB DC DD DE DF
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
</map>
</upper>
<unicode>
<map>
0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
0010 0011 0012 0013 0014 0015 0016 0017 0018 0019 001A 001B 001C 001D 001E 001F
0020 0021 0022 0023 0024 0025 0026 0027 0028 0029 002A 002B 002C 002D 002E 002F
0030 0031 0032 0033 0034 0035 0036 0037 0038 0039 003A 003B 003C 003D 003E 003F
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 007F
20AC 0000 201A 0000 201E 2026 2020 2021 0000 2030 0000 2039 0000 0000 0000 0000
0000 2018 2019 201C 201D 2022 2013 2014 0000 0000 0000 203A 0000 0000 0000 0000
00A0 00A1 00A2 00A3 00A4 00A5 00A6 00A7 00A8 00A9 00AA 00AB 00AC 00AD 00AE 00AF
00B0 00B1 00B2 00B3 00B4 00B5 00B6 00B7 00B8 00B9 00BA 00BB 00BC 00BD 00BE 00BF
10D0 10D1 10D2 10D3 10D4 10D5 10D6 10F1 10D7 10D8 10D9 10DA 10DB 10DC 10F2 10DD
10DE 10DF 10E0 10E1 10E2 10F3 10E3 10E4 10E5 10E6 10E7 10E8 10E9 10EA 10EB 10EC
10ED 10EE 10F4 10EF 10F0 10F5 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 2116 0000 0000
</map>
</unicode>
<collation name="geostd8_general_ci">
<map>
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
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 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 B8 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 D6 D7 D8 D9 DA DB DC DD DE DF
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
</map>
</collation>
<collation name="geostd8_bin" flag="binary"/>
</charset>
</charsets>

2
strings/ctype-big5.c
View file

@ -6300,7 +6300,7 @@ CHARSET_INFO my_charset_big5_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_big5_handler,

2
strings/ctype-bin.c
View file

@ -312,7 +312,7 @@ CHARSET_INFO my_charset_bin =
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
"","",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
1, /* mbmaxlen */
(char) 255, /* max_sort_char */
&my_charset_handler,

4
strings/ctype-euc_kr.c
View file

@ -8686,7 +8686,7 @@ CHARSET_INFO my_charset_euckr_korean_ci=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,
@ -8709,7 +8709,7 @@ CHARSET_INFO my_charset_euckr_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,

4
strings/ctype-gb2312.c
View file

@ -5736,7 +5736,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,
@ -5758,7 +5758,7 @@ CHARSET_INFO my_charset_gb2312_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,

2
strings/ctype-gbk.c
View file

@ -9955,7 +9955,7 @@ CHARSET_INFO my_charset_gbk_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,

4
strings/ctype-latin1.c
View file

@ -213,7 +213,7 @@ CHARSET_INFO my_charset_latin1=
latin1_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
"","",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
1, /* mbmaxlen */
0,
&my_charset_handler,
@ -477,7 +477,7 @@ CHARSET_INFO my_charset_latin1_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
1, /* mbmaxlen */
0,
&my_charset_handler,

2
strings/ctype-sjis.c
View file

@ -4542,7 +4542,7 @@ CHARSET_INFO my_charset_sjis_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,

2
strings/ctype-tis620.c
View file

@ -762,7 +762,7 @@ CHARSET_INFO my_charset_tis620_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
1, /* mbmaxlen */
0,
&my_charset_handler,

2
strings/ctype-ucs2.c
View file

@ -1077,7 +1077,7 @@ CHARSET_INFO my_charset_ucs2_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
2, /* mbmaxlen */
0,
&my_charset_handler,

4
strings/ctype-ujis.c
View file

@ -8477,7 +8477,7 @@ CHARSET_INFO my_charset_ujis_japanese_ci=
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
"","",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
3, /* mbmaxlen */
0,
&my_charset_handler,
@ -8499,7 +8499,7 @@ CHARSET_INFO my_charset_ujis_bin=
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
"","",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
3, /* mbmaxlen */
0,
&my_charset_handler,

2
strings/ctype-utf8.c
View file

@ -2026,7 +2026,7 @@ CHARSET_INFO my_charset_utf8_bin=
NULL, /* tab_from_uni */
"",
"",
0, /* strxfrm_multiply */
1, /* strxfrm_multiply */
3, /* mbmaxlen */
0,
&my_charset_handler,