From cfc99ce45c30254e9730baaece196028ab7b0d2f Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Sat, 4 Jan 2003 16:33:42 +0200
Subject: [PATCH 01/28] fixed SET with subselect
---
mysql-test/r/subselect.result | 7 +++++++
mysql-test/t/subselect.test | 5 +++++
sql/sql_parse.cc | 9 ++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 38a8e0368c6..97191567cc9 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -848,6 +848,13 @@ do @a:=(SELECT a from t);
select @a;
@a
1
+set @a:=2;
+set @a:=(SELECT a from t);
+select @a;
+@a
+1
drop table t;
do (SELECT a from t);
Table 'test.t' doesn't exist
+set @a:=(SELECT a from t);
+Table 'test.t' doesn't exist
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index de07df1905b..608657e69d5 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -468,6 +468,11 @@ create table t (a int);
insert into t values (1);
do @a:=(SELECT a from t);
select @a;
+set @a:=2;
+set @a:=(SELECT a from t);
+select @a;
drop table t;
-- error 1146
do (SELECT a from t);
+-- error 1146
+set @a:=(SELECT a from t);
\ No newline at end of file
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index e74c7e35328..74c64232cec 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2470,9 +2470,16 @@ mysql_execute_command(THD *thd)
break;
}
case SQLCOM_SET_OPTION:
- if (!(res=sql_set_variables(thd, &lex->var_list)))
+ if (tables && ((res= check_table_access(thd, SELECT_ACL, tables)) ||
+ (res= open_and_lock_tables(thd,tables))))
+ break;
+ fix_tables_pointers(lex->all_selects_list);
+ if (!(res= sql_set_variables(thd, &lex->var_list)))
send_ok(thd);
+ if (thd->net.report_error)
+ res= -1;
break;
+
case SQLCOM_UNLOCK_TABLES:
unlock_locked_tables(thd);
if (thd->options & OPTION_TABLE_LOCK)
From e4b9df7ba5a030f3bd79f8c57efddb9afceb4976 Mon Sep 17 00:00:00 2001
From: "wax@mysql.com" <>
Date: Sat, 4 Jan 2003 20:33:17 +0500
Subject: [PATCH 02/28] Fix bug with shared memory's variables
---
sql/mysql_priv.h | 2 ++
sql/mysqld.cc | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 4d819ef6ae7..d89816a0dd9 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -708,6 +708,8 @@ extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;
extern my_bool opt_safe_show_db, opt_local_infile, lower_case_table_names;
extern my_bool opt_slave_compressed_protocol, use_temp_pool;
extern my_bool opt_enable_named_pipe;
+extern char *shared_memory_base_name;
+extern bool opt_enable_shared_memory;
extern char f_fyllchar;
extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b607bcdb3a1..01dadbb6223 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -345,8 +345,8 @@ arg_cmp_func Arg_comparator::comparator_matrix[4][2] =
{&Arg_comparator::compare_int, &Arg_comparator::compare_e_int},
{&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}};
#ifdef HAVE_SMEM
-static char *shared_memory_base_name=default_shared_memory_base_name;
-static bool opt_enable_shared_memory = 0;
+char *shared_memory_base_name=default_shared_memory_base_name;
+bool opt_enable_shared_memory = 0;
#endif
volatile ulong cached_thread_count=0;
From e3c446994a0daa6715a6b959a623eba442a5b3d5 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 14:34:06 +0400
Subject: [PATCH 03/28] MacRoman.xml, MacCE.xml: new file
---
sql/share/charsets/MacCE.xml | 209 ++++++++++++++++++++++++++++++++
sql/share/charsets/MacRoman.xml | 201 ++++++++++++++++++++++++++++++
2 files changed, 410 insertions(+)
create mode 100644 sql/share/charsets/MacCE.xml
create mode 100644 sql/share/charsets/MacRoman.xml
diff --git a/sql/share/charsets/MacCE.xml b/sql/share/charsets/MacCE.xml
new file mode 100644
index 00000000000..fe64fd18abc
--- /dev/null
+++ b/sql/share/charsets/MacCE.xml
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/MacRoman.xml b/sql/share/charsets/MacRoman.xml
new file mode 100644
index 00000000000..b7e222edcac
--- /dev/null
+++ b/sql/share/charsets/MacRoman.xml
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 2dc6e2755350d6847f37e4e47be5ab70f0ed190f Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 14:36:51 +0400
Subject: [PATCH 04/28] MacRoman.xml: charset name was wrong
---
sql/share/charsets/MacRoman.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sql/share/charsets/MacRoman.xml b/sql/share/charsets/MacRoman.xml
index b7e222edcac..b17860f56b2 100644
--- a/sql/share/charsets/MacRoman.xml
+++ b/sql/share/charsets/MacRoman.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/sql/share/charsets/cp1250.xml b/sql/share/charsets/cp1250.xml
new file mode 100644
index 00000000000..a863aceffc9
--- /dev/null
+++ b/sql/share/charsets/cp1250.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 89c6a4c120aed84dbe63776fe5ed5cf4868b15e4 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 15:38:43 +0400
Subject: [PATCH 18/28] swe7.xml, ascii.xml: new file Index.xml: usa7 ->
ascii
---
sql/share/charsets/Index.xml | 2 +-
sql/share/charsets/ascii.xml | 119 ++++++++++++++++++++++++++++++++++
sql/share/charsets/swe7.xml | 121 +++++++++++++++++++++++++++++++++++
3 files changed, 241 insertions(+), 1 deletion(-)
create mode 100644 sql/share/charsets/ascii.xml
create mode 100644 sql/share/charsets/swe7.xml
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 8f472d83fe4..adea783defc 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -145,7 +145,7 @@ To make maintaining easier please:
csascii
iso-ir-6
iso646-us
-
+
diff --git a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml
new file mode 100644
index 00000000000..67ab57de88f
--- /dev/null
+++ b/sql/share/charsets/ascii.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/swe7.xml b/sql/share/charsets/swe7.xml
new file mode 100644
index 00000000000..ffa1d90608d
--- /dev/null
+++ b/sql/share/charsets/swe7.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From db81a046e783b31795a22b8602156cd58dc22f6c Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 15:50:41 +0400
Subject: [PATCH 19/28] dec8.xml, armscii8.xml, cp866.xml: new file
---
sql/share/charsets/armscii8.xml | 119 +++++++++++++++++++++++++++++++
sql/share/charsets/cp866.xml | 122 ++++++++++++++++++++++++++++++++
sql/share/charsets/dec8.xml | 121 +++++++++++++++++++++++++++++++
3 files changed, 362 insertions(+)
create mode 100644 sql/share/charsets/armscii8.xml
create mode 100644 sql/share/charsets/cp866.xml
create mode 100644 sql/share/charsets/dec8.xml
diff --git a/sql/share/charsets/armscii8.xml b/sql/share/charsets/armscii8.xml
new file mode 100644
index 00000000000..99ab5eb336d
--- /dev/null
+++ b/sql/share/charsets/armscii8.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/cp866.xml b/sql/share/charsets/cp866.xml
new file mode 100644
index 00000000000..2b050f3c993
--- /dev/null
+++ b/sql/share/charsets/cp866.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/dec8.xml b/sql/share/charsets/dec8.xml
new file mode 100644
index 00000000000..4e76bbffd14
--- /dev/null
+++ b/sql/share/charsets/dec8.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 24f527a1c65fa515e4cdabe666994644da83ae0d Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 15:56:37 +0400
Subject: [PATCH 20/28] hebrew.xml, greek.xml: new file
---
sql/share/charsets/greek.xml | 120 ++++++++++++++++++++++++++++++++++
sql/share/charsets/hebrew.xml | 120 ++++++++++++++++++++++++++++++++++
2 files changed, 240 insertions(+)
create mode 100644 sql/share/charsets/greek.xml
create mode 100644 sql/share/charsets/hebrew.xml
diff --git a/sql/share/charsets/greek.xml b/sql/share/charsets/greek.xml
new file mode 100644
index 00000000000..eeb22236675
--- /dev/null
+++ b/sql/share/charsets/greek.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/hebrew.xml b/sql/share/charsets/hebrew.xml
new file mode 100644
index 00000000000..3bf8bec370e
--- /dev/null
+++ b/sql/share/charsets/hebrew.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 2bb86d4d610a3d2d3a4031a3abc17b8e9037fb13 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 16:02:32 +0400
Subject: [PATCH 21/28] keybcs2.xml, hp8.xml: new file
---
sql/share/charsets/hp8.xml | 120 +++++++++++++++++++++++++++++++++
sql/share/charsets/keybcs2.xml | 120 +++++++++++++++++++++++++++++++++
2 files changed, 240 insertions(+)
create mode 100644 sql/share/charsets/hp8.xml
create mode 100644 sql/share/charsets/keybcs2.xml
diff --git a/sql/share/charsets/hp8.xml b/sql/share/charsets/hp8.xml
new file mode 100644
index 00000000000..036f1cd067c
--- /dev/null
+++ b/sql/share/charsets/hp8.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/keybcs2.xml b/sql/share/charsets/keybcs2.xml
new file mode 100644
index 00000000000..bdbb364822f
--- /dev/null
+++ b/sql/share/charsets/keybcs2.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 12a05a357a5b69617c01933b7cec1e930c947570 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 16:14:56 +0400
Subject: [PATCH 22/28] koi8_u.xml, koi8_r.xml: new file Index.xml: these
names look more standard
---
sql/share/charsets/Index.xml | 8 +--
sql/share/charsets/koi8_r.xml | 119 +++++++++++++++++++++++++++++++++
sql/share/charsets/koi8_u.xml | 120 ++++++++++++++++++++++++++++++++++
3 files changed, 243 insertions(+), 4 deletions(-)
create mode 100644 sql/share/charsets/koi8_r.xml
create mode 100644 sql/share/charsets/koi8_u.xml
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index adea783defc..e744e500cba 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -125,11 +125,11 @@ To make maintaining easier please:
-
+
Cyrillic
koi8-ru
cskoi8r
-
+
@@ -229,10 +229,10 @@ To make maintaining easier please:
-
+
Cyrillic
koi8-u
-
+
diff --git a/sql/share/charsets/koi8_r.xml b/sql/share/charsets/koi8_r.xml
new file mode 100644
index 00000000000..aa155e4cf69
--- /dev/null
+++ b/sql/share/charsets/koi8_r.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/share/charsets/koi8_u.xml b/sql/share/charsets/koi8_u.xml
new file mode 100644
index 00000000000..6281a2a14fb
--- /dev/null
+++ b/sql/share/charsets/koi8_u.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 40c61f57638ca856a80cca5fbe3a3c212edfb80a Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 16:44:39 +0400
Subject: [PATCH 23/28] Many files: PRIMARY flag for built-in charsets
---
strings/ctype-big5.c | 2 +-
strings/ctype-bin.c | 2 +-
strings/ctype-euc_kr.c | 2 +-
strings/ctype-gb2312.c | 2 +-
strings/ctype-gbk.c | 2 +-
strings/ctype-sjis.c | 2 +-
strings/ctype-tis620.c | 2 +-
strings/ctype-ujis.c | 2 +-
strings/ctype-utf8.c | 4 ++--
strings/ctype.c | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 74ff300c9e9..408c7f8fe35 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6218,7 +6218,7 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_big5 =
{
1, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"big5", /* cs name */
"big5", /* name */
"", /* comment */
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 377e50f3dab..0d7729721ad 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -259,7 +259,7 @@ static int my_wildcmp_bin(CHARSET_INFO *cs,
static CHARSET_INFO my_charset_bin_st =
{
63, /* number */
- MY_CS_COMPILED|MY_CS_BINSORT,/* state */
+ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */
"binary", /* cs name */
"binary", /* name */
"", /* comment */
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 6388d4b062f..5a93881a77f 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8636,7 +8636,7 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_euc_kr =
{
19, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"euc_kr", /* cs name */
"euc_kr", /* name */
"", /* comment */
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 77a55f6dadc..d575e48a59a 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5686,7 +5686,7 @@ my_mb_wc_gb2312(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_gb2312 =
{
24, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"gb2312", /* cs name */
"gb2312", /* name */
"", /* comment */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 004c3c778e0..0094a93e5f8 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9873,7 +9873,7 @@ my_mb_wc_gbk(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_gbk =
{
28, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"gbk", /* cs name */
"gbk", /* name */
"", /* comment */
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 1e9a5895683..3949be5e215 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4460,7 +4460,7 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_sjis =
{
13, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"sjis", /* cs name */
"sjis", /* name */
"", /* comment */
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index b448ebdd926..7168026eea5 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -688,7 +688,7 @@ void ThNormalize(uchar* ptr, uint field_length, const uchar* from, uint length)
CHARSET_INFO my_charset_tis620 =
{
18, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"tis620", /* cs name */
"tis620", /* name */
"", /* comment */
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 2c3c8dd11c3..0a0024594e4 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8430,7 +8430,7 @@ my_wc_mb_euc_jp(CHARSET_INFO *c,my_wc_t wc, unsigned char *s, unsigned char *e)
CHARSET_INFO my_charset_ujis =
{
12, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"ujis", /* cs name */
"ujis", /* name */
"", /* comment */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 738bcde92b6..42a70731ab5 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1958,7 +1958,7 @@ static int my_mbcharlen_utf8(CHARSET_INFO *cs __attribute__((unused)) , uint c)
CHARSET_INFO my_charset_utf8 =
{
33, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"utf8", /* cs name */
"utf8", /* name */
"", /* comment */
@@ -3025,7 +3025,7 @@ cnv:
CHARSET_INFO my_charset_ucs2 =
{
35, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"ucs2", /* cs name */
"ucs2", /* name */
"", /* comment */
diff --git a/strings/ctype.c b/strings/ctype.c
index e49c0b6614f..589271baa37 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -2810,7 +2810,7 @@ static CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_latin1
{
8, /* number */
- MY_CS_COMPILED, /* state */
+ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
"latin1", /* cs name */
"latin1", /* name */
"", /* comment */
From 4e405fa200dede32477707d98be93f7e9042cdbb Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 17:34:24 +0400
Subject: [PATCH 24/28] koi8_ru -> koi8_r charset.conf -> charset.xml bug fix
---
mysql-test/r/ctype_many.result | 14 +-
mysql-test/t/ctype_many.test | 4 +-
mysys/charset.c | 384 ++++++++++++++++++---------------
sql/share/Makefile.am | 3 +-
strings/ctype-simple.c | 2 +-
5 files changed, 216 insertions(+), 191 deletions(-)
diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index a483145e33a..ec6e0b76772 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@@ -1,27 +1,27 @@
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
comment CHAR(32) ASCII NOT NULL,
-koi8_ru_f CHAR(32) CHARACTER SET koi8_ru NOT NULL
+koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL
) CHARSET=latin5;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`comment` char(32) character set latin1 NOT NULL default '',
- `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+ `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
) TYPE=MyISAM CHARSET=latin5
ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`comment` char(32) character set latin2 NOT NULL default '',
- `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+ `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
) TYPE=MyISAM CHARSET=latin5
ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`comment` char(32) character set latin2 NOT NULL default '',
- `koi8_ru_f` char(32) character set koi8_ru NOT NULL default '',
+ `koi8_ru_f` char(32) character set koi8_r NOT NULL default '',
`latin5_f` char(32) character set latin5 NOT NULL default ''
) TYPE=MyISAM CHARSET=latin5
ALTER TABLE t1 CHARSET=latin2;
@@ -30,7 +30,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`comment` char(32) character set latin2 NOT NULL default '',
- `koi8_ru_f` char(32) character set koi8_ru NOT NULL default '',
+ `koi8_ru_f` char(32) character set koi8_r NOT NULL default '',
`latin5_f` char(32) character set latin5 NOT NULL default '',
`latin2_f` char(32) character set latin2 NOT NULL default ''
) TYPE=MyISAM CHARSET=latin2
@@ -39,7 +39,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`comment` char(32) character set latin2 NOT NULL default '',
- `koi8_ru_f` char(32) character set koi8_ru NOT NULL default ''
+ `koi8_ru_f` char(32) character set koi8_r NOT NULL default ''
) TYPE=MyISAM CHARSET=latin2
INSERT INTO t1 (koi8_ru_f,comment) VALUES ('a','LAT SMALL A');
INSERT INTO t1 (koi8_ru_f,comment) VALUES ('b','LAT SMALL B');
@@ -1061,7 +1061,7 @@ CYR SMALL YA CYR CAPIT YA
CYR SMALL YA CYR SMALL YA
SELECT t11.comment,t12.comment
FROM t1 t11,t1 t12
-WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
+WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r)
ORDER BY t12.utf8_f,t11.comment,t12.comment;
comment comment
LAT CAPIT A LAT CAPIT A
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index b02684b2fb8..b5ca63507e8 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
comment CHAR(32) ASCII NOT NULL,
- koi8_ru_f CHAR(32) CHARACTER SET koi8_ru NOT NULL
+ koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL
) CHARSET=latin5;
SHOW CREATE TABLE t1;
@@ -156,7 +156,7 @@ ORDER BY t11.koi8_ru_f,t11.comment,t12.comment;
SELECT t11.comment,t12.comment
FROM t1 t11,t1 t12
-WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
+WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r)
ORDER BY t12.utf8_f,t11.comment,t12.comment;
ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;
diff --git a/mysys/charset.c b/mysys/charset.c
index f590ee2a49e..c94f2e91817 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -21,6 +21,11 @@
#include
#include
+
+static void set_max_sort_char(CHARSET_INFO *cs);
+static my_bool create_fromuni(CHARSET_INFO *cs);
+
+
#define MY_CHARSET_INDEX "Index.xml"
const char *charsets_dir = NULL;
@@ -34,37 +39,6 @@ static int charset_initialized=0;
#define SORT_ORDER_TABLE_SIZE 256
#define TO_UNI_TABLE_SIZE 256
-struct simpleconfig_buf_st {
- FILE *f;
- char buf[MAX_LINE];
- char *p;
-};
-
-
-static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
-{
- char *endptr=fb->p;
-
- for (;;)
- {
- while (my_isspace(system_charset_info, *endptr))
- ++endptr;
- if (*endptr && *endptr != '#') /* Not comment */
- break; /* Found something */
- if ((fgets(fb->buf, sizeof(fb->buf), fb->f)) == NULL)
- return TRUE; /* end of file */
- endptr = fb->buf;
- }
-
- while (!my_isspace(system_charset_info, *endptr))
- *buf++= *endptr++;
- *buf=0;
- fb->p = endptr;
-
- return FALSE;
-}
-
-
char *get_charsets_dir(char *buf)
{
const char *sharedir = SHAREDIR;
@@ -89,13 +63,14 @@ char *get_charsets_dir(char *buf)
#define MAX_BUF 1024*16
-
+#ifndef DBUG_OFF
static void mstr(char *str,const char *src,uint l1,uint l2)
{
l1 = l1like_range = my_like_range_simple;
+ cs->wildcmp = my_wildcmp_8bit;
+ cs->strnncoll = my_strnncoll_simple;
+ cs->caseup_str = my_caseup_str_8bit;
+ cs->casedn_str = my_casedn_str_8bit;
+ cs->caseup = my_caseup_8bit;
+ cs->casedn = my_casedn_8bit;
+ cs->tosort = my_tosort_8bit;
+ cs->strcasecmp = my_strcasecmp_8bit;
+ cs->strncasecmp = my_strncasecmp_8bit;
+ cs->mb_wc = my_mb_wc_8bit;
+ cs->wc_mb = my_wc_mb_8bit;
+ cs->hash_caseup = my_hash_caseup_simple;
+ cs->hash_sort = my_hash_sort_simple;
+ cs->snprintf = my_snprintf_8bit;
+ cs->strntol = my_strntol_8bit;
+ cs->strntoul = my_strntoul_8bit;
+ cs->strntoll = my_strntoll_8bit;
+ cs->strntoull = my_strntoull_8bit;
+ cs->strntod = my_strntod_8bit;
+ cs->mbmaxlen = 1;
+}
+
+static void simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
+{
+ to->number = from->number ? from->number : to->number;
+ to->state |= from->state;
+
+ if (from->csname)
+ to->csname=my_strdup(from->csname,MYF(MY_WME));
+
+ if (from->name)
+ to->name=my_strdup(from->name,MYF(MY_WME));
+
+ if (from->ctype)
+ {
+ to->ctype = (uchar*) my_once_alloc(CTYPE_TABLE_SIZE,MYF(MY_WME));
+ memcpy((char*)to->ctype,(char*)from->ctype,CTYPE_TABLE_SIZE);
+ }
+ if (from->to_lower)
+ {
+ to->to_lower = (uchar*) my_once_alloc(TO_LOWER_TABLE_SIZE,MYF(MY_WME));
+ memcpy((char*)to->to_lower,(char*)from->to_lower,TO_LOWER_TABLE_SIZE);
+ }
+ if (from->to_upper)
+ {
+ to->to_upper = (uchar*) my_once_alloc(TO_UPPER_TABLE_SIZE,MYF(MY_WME));
+ memcpy((char*)to->to_upper,(char*)from->to_upper,TO_UPPER_TABLE_SIZE);
+ }
+ if (from->sort_order)
+ {
+ to->sort_order=(uchar*) my_once_alloc(SORT_ORDER_TABLE_SIZE,MYF(MY_WME));
+ memcpy((char*)to->sort_order,(char*)from->sort_order, SORT_ORDER_TABLE_SIZE);
+ set_max_sort_char(to);
+ }
+ if (from->tab_to_uni)
+ {
+ uint sz=TO_UNI_TABLE_SIZE*sizeof(uint16);
+ to->tab_to_uni=(uint16*)my_once_alloc(sz,MYF(MY_WME));
+ memcpy((char*)to->tab_to_uni,(char*)from->tab_to_uni,sz);
+ create_fromuni(to);
+ }
+}
+
+static my_bool simple_cs_is_full(CHARSET_INFO *cs)
+{
+ return
+ (cs->csname && cs->tab_to_uni && cs->ctype && cs->to_upper && cs->to_lower)
+ &&
+ (cs->number && cs->name && cs->sort_order);
+}
+
+static int fill_uchar(uchar *a,uint size,const char *str, uint len)
+{
+ uint i=0;
+ const char *s, *b, *e=str+len;
+
+ for (s=str ; ssize)
+ break;
+ a[i]=my_strntoul(my_charset_latin1,b,s-b,NULL,16);
+ }
+ return 0;
+}
+
+static int fill_uint16(uint16 *a,uint size,const char *str, uint len)
+{
+ uint i=0;
+ const char *s, *b, *e=str+len;
+ char buf[6];
+ for (s=str ; ssize)
+ break;
+ mstr(buf,b,6,s-b);
+ a[i]=my_strntol(my_charset_latin1,b,s-b,NULL,16);
+ }
+ return 0;
+}
+
static int cs_enter(MY_XML_PARSER *st,const char *attr, uint len)
{
struct my_cs_file_info *i = (struct my_cs_file_info *)st->user_data;
@@ -169,21 +280,35 @@ static int cs_leave(MY_XML_PARSER *st,const char *attr, uint len)
if (state == _CS_COLLATION)
{
- if (!all_charsets[i->cs.number])
+ if (i->cs.name && (i->cs.number || (i->cs.number=get_charset_number(i->cs.name))))
{
- if (!(all_charsets[i->cs.number]=
- (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),i->myflags)))
+ if (!all_charsets[i->cs.number])
{
- return MY_XML_ERROR;
+ if (!(all_charsets[i->cs.number]=
+ (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),i->myflags)))
+ {
+ return MY_XML_ERROR;
+ }
+ bzero((void*)all_charsets[i->cs.number],sizeof(CHARSET_INFO));
}
- all_charsets[i->cs.number][0]=i->cs;
+
+ if (!(all_charsets[i->cs.number]->state & MY_CS_COMPILED))
+ {
+ simple_cs_copy_data(all_charsets[i->cs.number],&i->cs);
+ if (simple_cs_is_full(all_charsets[i->cs.number]))
+ {
+ simple_cs_init_functions(all_charsets[i->cs.number]);
+ all_charsets[i->cs.number]->state |= MY_CS_LOADED;
+ }
+ }
+ i->cs.number=0;
+ i->cs.name=NULL;
+ i->cs.state=0;
+ i->cs.sort_order=NULL;
+ i->cs.state=0;
}
- else
- {
- all_charsets[i->cs.number]->state |= i->cs.state;
- }
- i->cs.state=0;
}
+
return MY_XML_OK;
}
@@ -193,12 +318,13 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
struct my_cs_file_section_st *s;
int state = (s=cs_file_sec(st->attr,strlen(st->attr))) ? s->state : 0;
- if(0)
- {
- char str[256];
+#ifndef DBUG_OFF
+ if(0){
+ char str[1024];
mstr(str,attr,len,sizeof(str)-1);
printf("VALUE %d %s='%s'\n",state,st->attr,str);
}
+#endif
switch (state)
{
@@ -206,22 +332,39 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
i->cs.number = my_strntoul(my_charset_latin1,attr,len,(char**)NULL,0);
break;
case _CS_COLNAME:
- if ((i->cs.name = (char*) my_once_alloc(len+1,i->myflags)))
- {
- memcpy((char*)i->cs.name,attr,len);
- ((char*)(i->cs.name))[len]='\0';
- }
+ memcpy(i->name,attr,len=min(len,CS_MAX_NM_LEN-1));
+ i->name[len]='\0';
+ i->cs.name=i->name;
break;
case _CS_NAME:
- if ((i->cs.csname = (char*) my_once_alloc(len+1,i->myflags)))
- {
- memcpy((char*)i->cs.csname,attr,len);
- ((char*)(i->cs.csname))[len]='\0';
- }
+ memcpy(i->csname,attr,len=min(len,CS_MAX_NM_LEN-1));
+ i->csname[len]='\0';
+ i->cs.csname=i->csname;
break;
case _CS_FLAG:
if (!strncmp("primary",attr,len))
i->cs.state |= MY_CS_PRIMARY;
+ break;
+ case _CS_UPPERMAP:
+ fill_uchar(i->to_upper,TO_UPPER_TABLE_SIZE,attr,len);
+ i->cs.to_upper=i->to_upper;
+ break;
+ case _CS_LOWERMAP:
+ fill_uchar(i->to_lower,TO_LOWER_TABLE_SIZE,attr,len);
+ i->cs.to_lower=i->to_lower;
+ break;
+ case _CS_UNIMAP:
+ fill_uint16(i->tab_to_uni,TO_UNI_TABLE_SIZE,attr,len);
+ i->cs.tab_to_uni=i->tab_to_uni;
+ break;
+ case _CS_COLLMAP:
+ fill_uchar(i->sort_order,SORT_ORDER_TABLE_SIZE,attr,len);
+ i->cs.sort_order=i->sort_order;
+ break;
+ case _CS_CTYPEMAP:
+ fill_uchar(i->ctype,CTYPE_TABLE_SIZE,attr,len);
+ i->cs.ctype=i->ctype;
+ break;
}
return MY_XML_OK;
}
@@ -326,38 +469,6 @@ void free_charsets(void)
charset_initialized=0;
}
-
-static my_bool fill_array(uchar *array, int sz, struct simpleconfig_buf_st *fb)
-{
- char buf[MAX_LINE];
- while (sz--)
- {
- if (get_word(fb, buf))
- {
- DBUG_PRINT("error",("get_word failed, expecting %d more words", sz + 1));
- return 1;
- }
- *array++ = (uchar) strtol(buf, NULL, 16);
- }
- return 0;
-}
-
-static my_bool fill_uint16_array(uint16 *array, int sz, struct simpleconfig_buf_st *fb)
-{
- char buf[MAX_LINE];
- while (sz--)
- {
- if (get_word(fb, buf))
- {
- DBUG_PRINT("error",("get_word failed, expecting %d more words", sz + 1));
- return 1;
- }
- *array++ = (uint16) strtol(buf, NULL, 16);
- }
- return 0;
-}
-
-
static void get_charset_conf_name(const char *cs_name, char *buf)
{
strxmov(get_charsets_dir(buf), cs_name, ".conf", NullS);
@@ -449,96 +560,6 @@ static my_bool create_fromuni(CHARSET_INFO *cs){
}
-static my_bool read_charset_file(const char *cs_name, CHARSET_INFO *set,
- myf myflags)
-{
- struct simpleconfig_buf_st fb;
- char buf[FN_REFLEN];
- my_bool result;
- DBUG_ENTER("read_charset_file");
- DBUG_PRINT("enter",("cs_name: %s", cs_name));
-
- get_charset_conf_name(cs_name, buf);
- DBUG_PRINT("info",("file name: %s", buf));
-
- if ((fb.f = my_fopen(buf, O_RDONLY, myflags)) == NULL)
- DBUG_RETURN(TRUE);
-
- fb.buf[0] = '\0'; /* Init for get_word */
- fb.p = fb.buf;
-
- result=FALSE;
- if (fill_array(set->ctype, CTYPE_TABLE_SIZE, &fb) ||
- fill_array(set->to_lower, TO_LOWER_TABLE_SIZE, &fb) ||
- fill_array(set->to_upper, TO_UPPER_TABLE_SIZE, &fb) ||
- fill_array(set->sort_order, SORT_ORDER_TABLE_SIZE, &fb) ||
- fill_uint16_array(set->tab_to_uni,TO_UNI_TABLE_SIZE,&fb))
- result=TRUE;
-
- my_fclose(fb.f, MYF(0));
- DBUG_RETURN(result);
-}
-
-
-static CHARSET_INFO *add_charset(CHARSET_INFO *cs, myf flags)
-{
- uchar tmp_ctype[CTYPE_TABLE_SIZE];
- uchar tmp_to_lower[TO_LOWER_TABLE_SIZE];
- uchar tmp_to_upper[TO_UPPER_TABLE_SIZE];
- uchar tmp_sort_order[SORT_ORDER_TABLE_SIZE];
- uint16 tmp_to_uni[TO_UNI_TABLE_SIZE];
-
- /* Note: cs->name and cs->number are already initialized */
-
- cs->ctype=tmp_ctype;
- cs->to_lower=tmp_to_lower;
- cs->to_upper=tmp_to_upper;
- cs->sort_order=tmp_sort_order;
- cs->tab_to_uni=tmp_to_uni;
- if (read_charset_file(cs->name, cs, flags))
- return NULL;
-
- cs->ctype = (uchar*) my_once_alloc(CTYPE_TABLE_SIZE, MYF(MY_WME));
- cs->to_lower = (uchar*) my_once_alloc(TO_LOWER_TABLE_SIZE, MYF(MY_WME));
- cs->to_upper = (uchar*) my_once_alloc(TO_UPPER_TABLE_SIZE, MYF(MY_WME));
- cs->sort_order=(uchar*) my_once_alloc(SORT_ORDER_TABLE_SIZE, MYF(MY_WME));
- cs->tab_to_uni=(uint16*)my_once_alloc(TO_UNI_TABLE_SIZE*sizeof(uint16), MYF(MY_WME));
- memcpy((char*) cs->ctype, (char*) tmp_ctype, sizeof(tmp_ctype));
- memcpy((char*) cs->to_lower, (char*) tmp_to_lower, sizeof(tmp_to_lower));
- memcpy((char*) cs->to_upper, (char*) tmp_to_upper, sizeof(tmp_to_upper));
- memcpy((char*) cs->sort_order, (char*) tmp_sort_order,
- sizeof(tmp_sort_order));
- memcpy((char*) cs->tab_to_uni, (char*) tmp_to_uni, sizeof(tmp_to_uni));
-
- cs->like_range = my_like_range_simple;
- cs->wildcmp = my_wildcmp_8bit;
- cs->strnncoll = my_strnncoll_simple;
- cs->caseup_str = my_caseup_str_8bit;
- cs->casedn_str = my_casedn_str_8bit;
- cs->caseup = my_caseup_8bit;
- cs->casedn = my_casedn_8bit;
- cs->tosort = my_tosort_8bit;
- cs->strcasecmp = my_strcasecmp_8bit;
- cs->strncasecmp = my_strncasecmp_8bit;
- cs->mb_wc = my_mb_wc_8bit;
- cs->wc_mb = my_wc_mb_8bit;
- cs->hash_caseup = my_hash_caseup_simple;
- cs->hash_sort = my_hash_sort_simple;
- cs->snprintf = my_snprintf_8bit;
- cs->strntol = my_strntol_8bit;
- cs->strntoul = my_strntoul_8bit;
- cs->strntoll = my_strntoll_8bit;
- cs->strntoull = my_strntoull_8bit;
- cs->strntod = my_strntod_8bit;
- cs->mbmaxlen = 1;
-
- set_max_sort_char(cs);
- create_fromuni(cs);
-
- return cs;
-}
-
-
uint get_charset_number(const char *charset_name)
{
CHARSET_INFO **cs;
@@ -569,6 +590,7 @@ const char *get_charset_name(uint charset_number)
static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
{
+ char buf[FN_REFLEN];
CHARSET_INFO *cs;
/*
To make things thread safe we are not allowing other threads to interfere
@@ -577,9 +599,13 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
pthread_mutex_lock(&THR_LOCK_charset);
cs = all_charsets[cs_number];
- if (cs && !(cs->state & (MY_CS_COMPILED | MY_CS_LOADED)))
- cs=add_charset(cs, flags);
+ if (cs && !(cs->state & (MY_CS_COMPILED | MY_CS_LOADED)))
+ {
+ strxmov(buf, cs->csname, ".xml", NullS);
+ read_charset_index(buf,flags);
+ cs = (cs->state & MY_CS_LOADED) ? cs : NULL;
+ }
pthread_mutex_unlock(&THR_LOCK_charset);
return cs;
}
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index a1b506f1ff5..35202ff4722 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -25,8 +25,7 @@ install-data-local:
done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
- $(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(DESTDIR)$(pkgdatadir)/charsets/Index.xml
- $(INSTALL_DATA) $(srcdir)/charsets/*.conf $(DESTDIR)$(pkgdatadir)/charsets
+ $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
fix_errors:
for lang in @AVAILABLE_LANGUAGES@; \
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index fa1ece20b3e..49801478504 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -432,7 +432,7 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
c -= '0';
else if (c>='A' && c<='F')
c = c - 'A' + 10;
- else if (c>='a' && c<='a')
+ else if (c>='a' && c<='f')
c = c - 'a' + 10;
else
break;
From c12f92e5ee533296e8c57768c40e31957c5b7eee Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 17:35:45 +0400
Subject: [PATCH 25/28] ctype.c: koi8_ru -> koi8_r koi8_ukr -> koi8_u
usa7 -> ascii
---
strings/ctype.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/strings/ctype.c b/strings/ctype.c
index 589271baa37..f1bce6671cf 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -3399,8 +3399,8 @@ static CHARSET_INFO compiled_charsets[] = {
{
7, /* number */
MY_CS_COMPILED, /* state */
- "koi8_ru", /* cs name */
- "koi8_ru", /* name */
+ "koi8_r", /* cs name */
+ "koi8_r", /* name */
"", /* comment */
ctype_koi8_ru,
to_lower_koi8_ru,
@@ -3444,8 +3444,8 @@ static CHARSET_INFO compiled_charsets[] = {
{
22, /* number */
MY_CS_COMPILED, /* state */
- "koi8_ukr", /* cs name */
- "koi8_ukr", /* name */
+ "koi8_u", /* cs name */
+ "koi8_u", /* name */
"", /* comment */
ctype_koi8_ukr,
to_lower_koi8_ukr,
@@ -3628,7 +3628,7 @@ static CHARSET_INFO compiled_charsets[] = {
11, /* number */
MY_CS_COMPILED, /* state */
"ascii", /* cs name */
- "usa7", /* name */
+ "ascii", /* name */
"", /* comment */
ctype_usa7,
to_lower_usa7,
From 479d82689b46091bec3e7e17b33e5c36f2e98b68 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Sun, 5 Jan 2003 17:48:10 +0400
Subject: [PATCH 26/28] latin5.xml, cp1251.xml: Comments Index.xml:
Languages for cp1256 have been added .del-win1251ukr.conf~dc3540b3635ed226:
Delete: sql/share/charsets/win1251ukr.conf
.del-win1251.conf~b6bb6681f02917b6: Delete: sql/share/charsets/win1251.conf
.del-win1250.conf~ea4cecf79a9a2b57: Delete: sql/share/charsets/win1250.conf
.del-usa7.conf~7907e7e49aad1374: Delete: sql/share/charsets/usa7.conf
.del-swe7.conf~adc4138b9b597e76: Delete: sql/share/charsets/swe7.conf
.del-pclatin2.conf~2e905fa7381fd785: Delete:
sql/share/charsets/pclatin2.conf .del-macromancsas.conf~cb7d2383e8e4105d:
Delete: sql/share/charsets/macromancsas.conf
.del-macromancias.conf~c3061c0b22a0a3cb: Delete:
sql/share/charsets/macromancias.conf .del-macromanciai.conf~ea8974f393a79edd:
Delete: sql/share/charsets/macromanciai.conf
.del-macromanbin.conf~b9dcdb2797fbae67: Delete:
sql/share/charsets/macromanbin.conf .del-macroman.conf~ee6a39463223b952:
Delete: sql/share/charsets/macroman.conf .del-maccecsas.conf~5f1b2bfecf71fa0:
Delete: sql/share/charsets/maccecsas.conf
.del-maccecias.conf~8a71c3a534e70fdd: Delete:
sql/share/charsets/maccecias.conf .del-macceciai.conf~a4b13482b0d7a5c5:
Delete: sql/share/charsets/macceciai.conf
.del-maccebin.conf~b2b9eab235e1a1ae: Delete:
sql/share/charsets/maccebin.conf .del-macce.conf~aa8efe8ce8393c31: Delete:
sql/share/charsets/macce.conf .del-latvian1.conf~6c7c5b2a4c896567: Delete:
sql/share/charsets/latvian1.conf .del-latvian.conf~a7f7110785a5ff4d:
Delete: sql/share/charsets/latvian.conf .del-latin5.conf~be23bc5cf8489338:
Delete: sql/share/charsets/latin5.conf .del-latin2.conf~c45310f353a74d9:
Delete: sql/share/charsets/latin2.conf .del-latin1csas.conf~e8c5219976bde66b:
Delete: sql/share/charsets/latin1csas.conf
.del-latin1cias.conf~85465c4ba30e76d8: Delete:
sql/share/charsets/latin1cias.conf .del-latin1bin.conf~76f38a539b7dfa9f:
Delete: sql/share/charsets/latin1bin.conf .del-latin1.conf~b3d65fc96f2ce181:
Delete: sql/share/charsets/latin1.conf .del-koi8_ukr.conf~ce11d6ff8ffc4434:
Delete: sql/share/charsets/koi8_ukr.conf .del-koi8_ru.conf~334df7402af862c8:
Delete: sql/share/charsets/koi8_ru.conf .del-keybcs2.conf~db3e18f91b2075be:
Delete: sql/share/charsets/keybcs2.conf
.del-hungarian.conf~3b343f4ff7919cd: Delete:
sql/share/charsets/hungarian.conf .del-hp8.conf~4620f2afc37ae747: Delete:
sql/share/charsets/hp8.conf .del-hebrew.conf~94ba65846b69f5b7: Delete:
sql/share/charsets/hebrew.conf .del-greek.conf~68f2c5692866226d: Delete:
sql/share/charsets/greek.conf .del-german1.conf~765a04d69683cefe: Delete:
sql/share/charsets/german1.conf .del-estonia.conf~e78f662de664f3ac: Delete:
sql/share/charsets/estonia.conf .del-dos.conf~5a4357d3335ba812: Delete:
sql/share/charsets/dos.conf .del-dec8.conf~d882c1e5e4566b87: Delete:
sql/share/charsets/dec8.conf .del-croat.conf~fb40a3e77604268e: Delete:
sql/share/charsets/croat.conf .del-danish.conf~90ffe76b3fa5dd46: Delete:
sql/share/charsets/danish.conf .del-cp866.conf~a70093f2be0a509: Delete:
sql/share/charsets/cp866.conf .del-cp1257ltlvcsas.conf~2e55f43377962ede:
Delete: sql/share/charsets/cp1257ltlvcsas.conf
.del-cp1257ltlvcias.conf~883d366fc6aa24a1: Delete:
sql/share/charsets/cp1257ltlvcias.conf
.del-cp1257ltlvciai.conf~f47460f62dace37e: Delete:
sql/share/charsets/cp1257ltlvciai.conf .del-cp1257bin.conf~a34eda136d4d93b0:
Delete: sql/share/charsets/cp1257bin.conf .del-cp1257.conf~a47298b64ba2dfc1:
Delete: sql/share/charsets/cp1257.conf .del-cp1256.conf~92e4a7b31184387b:
Delete: sql/share/charsets/cp1256.conf .del-cp1251csas.conf~9c4b69407a10a136:
Delete: sql/share/charsets/cp1251csas.conf
.del-cp1251cias.conf~6e9b6b7ebafd497c: Delete:
sql/share/charsets/cp1251cias.conf .del-cp1251bin.conf~a7bf1f052611ca00:
Delete: sql/share/charsets/cp1251bin.conf .del-cp1251.conf~dfafe742142570:
Delete: sql/share/charsets/cp1251.conf .del-armscii8.conf~e612e5fb63e34cd4:
Delete: sql/share/charsets/armscii8.conf
---
sql/share/charsets/Index.xml | 8 +-
sql/share/charsets/armscii8.conf | 93 -----------------------
sql/share/charsets/cp1251.conf | 93 -----------------------
sql/share/charsets/cp1251.xml | 7 ++
sql/share/charsets/cp1251bin.conf | 95 -----------------------
sql/share/charsets/cp1251cias.conf | 99 ------------------------
sql/share/charsets/cp1251csas.conf | 99 ------------------------
sql/share/charsets/cp1256.conf | 94 -----------------------
sql/share/charsets/cp1257.conf | 92 -----------------------
sql/share/charsets/cp1257bin.conf | 96 ------------------------
sql/share/charsets/cp1257ltlvciai.conf | 97 ------------------------
sql/share/charsets/cp1257ltlvcias.conf | 97 ------------------------
sql/share/charsets/cp1257ltlvcsas.conf | 97 ------------------------
sql/share/charsets/cp866.conf | 96 ------------------------
sql/share/charsets/croat.conf | 92 -----------------------
sql/share/charsets/danish.conf | 92 -----------------------
sql/share/charsets/dec8.conf | 92 -----------------------
sql/share/charsets/dos.conf | 93 -----------------------
sql/share/charsets/estonia.conf | 92 -----------------------
sql/share/charsets/german1.conf | 92 -----------------------
sql/share/charsets/greek.conf | 93 -----------------------
sql/share/charsets/hebrew.conf | 93 -----------------------
sql/share/charsets/hp8.conf | 93 -----------------------
sql/share/charsets/hungarian.conf | 92 -----------------------
sql/share/charsets/keybcs2.conf | 91 ----------------------
sql/share/charsets/koi8_ru.conf | 93 -----------------------
sql/share/charsets/koi8_ukr.conf | 92 -----------------------
sql/share/charsets/latin1.conf | 92 -----------------------
sql/share/charsets/latin1bin.conf | 96 ------------------------
sql/share/charsets/latin1cias.conf | 97 ------------------------
sql/share/charsets/latin1csas.conf | 97 ------------------------
sql/share/charsets/latin2.conf | 92 -----------------------
sql/share/charsets/latin5.conf | 96 ------------------------
sql/share/charsets/latin5.xml | 5 ++
sql/share/charsets/latvian.conf | 95 -----------------------
sql/share/charsets/latvian1.conf | 94 -----------------------
sql/share/charsets/macce.conf | 91 ----------------------
sql/share/charsets/maccebin.conf | 96 ------------------------
sql/share/charsets/macceciai.conf | 96 ------------------------
sql/share/charsets/maccecias.conf | 96 ------------------------
sql/share/charsets/maccecsas.conf | 96 ------------------------
sql/share/charsets/macroman.conf | 91 ----------------------
sql/share/charsets/macromanbin.conf | 96 ------------------------
sql/share/charsets/macromanciai.conf | 97 ------------------------
sql/share/charsets/macromancias.conf | 97 ------------------------
sql/share/charsets/macromancsas.conf | 97 ------------------------
sql/share/charsets/pclatin2.conf | 91 ----------------------
sql/share/charsets/swe7.conf | 92 -----------------------
sql/share/charsets/usa7.conf | 92 -----------------------
sql/share/charsets/win1250.conf | 92 -----------------------
sql/share/charsets/win1251.conf | 100 -------------------------
sql/share/charsets/win1251ukr.conf | 95 -----------------------
52 files changed, 19 insertions(+), 4623 deletions(-)
delete mode 100644 sql/share/charsets/armscii8.conf
delete mode 100644 sql/share/charsets/cp1251.conf
delete mode 100644 sql/share/charsets/cp1251bin.conf
delete mode 100644 sql/share/charsets/cp1251cias.conf
delete mode 100644 sql/share/charsets/cp1251csas.conf
delete mode 100644 sql/share/charsets/cp1256.conf
delete mode 100644 sql/share/charsets/cp1257.conf
delete mode 100644 sql/share/charsets/cp1257bin.conf
delete mode 100644 sql/share/charsets/cp1257ltlvciai.conf
delete mode 100644 sql/share/charsets/cp1257ltlvcias.conf
delete mode 100644 sql/share/charsets/cp1257ltlvcsas.conf
delete mode 100644 sql/share/charsets/cp866.conf
delete mode 100644 sql/share/charsets/croat.conf
delete mode 100644 sql/share/charsets/danish.conf
delete mode 100644 sql/share/charsets/dec8.conf
delete mode 100644 sql/share/charsets/dos.conf
delete mode 100644 sql/share/charsets/estonia.conf
delete mode 100644 sql/share/charsets/german1.conf
delete mode 100644 sql/share/charsets/greek.conf
delete mode 100644 sql/share/charsets/hebrew.conf
delete mode 100644 sql/share/charsets/hp8.conf
delete mode 100644 sql/share/charsets/hungarian.conf
delete mode 100644 sql/share/charsets/keybcs2.conf
delete mode 100644 sql/share/charsets/koi8_ru.conf
delete mode 100644 sql/share/charsets/koi8_ukr.conf
delete mode 100644 sql/share/charsets/latin1.conf
delete mode 100644 sql/share/charsets/latin1bin.conf
delete mode 100644 sql/share/charsets/latin1cias.conf
delete mode 100644 sql/share/charsets/latin1csas.conf
delete mode 100644 sql/share/charsets/latin2.conf
delete mode 100644 sql/share/charsets/latin5.conf
delete mode 100644 sql/share/charsets/latvian.conf
delete mode 100644 sql/share/charsets/latvian1.conf
delete mode 100644 sql/share/charsets/macce.conf
delete mode 100644 sql/share/charsets/maccebin.conf
delete mode 100644 sql/share/charsets/macceciai.conf
delete mode 100644 sql/share/charsets/maccecias.conf
delete mode 100644 sql/share/charsets/maccecsas.conf
delete mode 100644 sql/share/charsets/macroman.conf
delete mode 100644 sql/share/charsets/macromanbin.conf
delete mode 100644 sql/share/charsets/macromanciai.conf
delete mode 100644 sql/share/charsets/macromancias.conf
delete mode 100644 sql/share/charsets/macromancsas.conf
delete mode 100644 sql/share/charsets/pclatin2.conf
delete mode 100644 sql/share/charsets/swe7.conf
delete mode 100644 sql/share/charsets/usa7.conf
delete mode 100644 sql/share/charsets/win1250.conf
delete mode 100644 sql/share/charsets/win1251.conf
delete mode 100644 sql/share/charsets/win1251ukr.conf
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index e744e500cba..fcd46970701 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -327,6 +327,7 @@ To make maintaining easier please:
866
csibm866
ibm866
+ DOSCyrillicRussian
@@ -445,7 +446,12 @@ To make maintaining easier please:
Arabic
ms-arab
windows-1256
-
+
+ Arabic
+ Persian
+ Pakistani
+ Urdu
+
diff --git a/sql/share/charsets/armscii8.conf b/sql/share/charsets/armscii8.conf
deleted file mode 100644
index 54d2d0fec47..00000000000
--- a/sql/share/charsets/armscii8.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-# Configuration file for the armscii8 (armenian) character set
-
-# 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
- 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 00
- 48 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10
- 10 10 01 02 01 02 01 02 01 02 01 02 01 02 01 02
- 01 02 01 02 01 02 01 02 01 02 01 02 01 02 01 02
- 01 02 01 02 01 02 01 02 01 02 01 02 01 02 01 02
- 01 02 01 02 01 02 01 02 01 02 01 02 01 02 01 02
- 01 02 01 02 01 02 01 02 01 02 01 02 01 02 10 10
-
-# 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 B3 B3 B5 B5 B7 B7 B9 B9 BB BB BD BD BF BF
- C1 C1 C3 C3 C5 C5 C7 C7 C9 C9 CB CB CD CD CF CF
- D1 D1 D3 D3 D5 D5 D7 D7 D9 D9 DB DB DD DD DF DF
- E1 E1 E3 E3 E5 E5 E7 E7 E9 E9 EB EB ED ED EF EF
- F1 F1 F3 F3 F5 F5 F7 F7 F9 F9 FB FB FD 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 B2 B4 B4 B6 B6 B8 B8 BA BA BC BC BE BE
- C0 C0 C2 C2 C4 C4 C6 C6 C8 C8 CA CA CC CC CE CE
- D0 D0 D2 D2 D4 D4 D6 D6 D8 D8 DA DA DC DC DE DE
- E0 E0 E2 E2 E4 E4 E6 E6 E8 E8 EA EA EC EC EE EE
- F0 F0 F2 F2 F4 F4 F6 F6 F8 F8 FA FA FC FC FE FF
-
-# 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 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
-
-
-# Unicode mapping (256 elements)
-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
-0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 008A 008B 008C 008D 008E 008F
-0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 009A 009B 009C 009D 009E 009F
-00A0 2741 00A7 0589 0029 0028 00BB 00AB 2014 002E 055D 002C 002D 055F 2026 055C
-055B 055E 0531 0561 0532 0562 0533 0563 0534 0564 0535 0565 0536 0566 0537 0567
-0538 0568 0539 0569 053A 056A 053B 056B 053C 056C 053D 056D 053E 056E 053F 056F
-0540 0570 0541 0571 0542 0572 0543 0573 0544 0574 0545 0575 0546 0576 0547 0577
-0548 0578 0549 0579 054A 057A 054B 057B 054C 057C 054D 057D 054E 057E 054F 057F
-0550 0580 0551 0581 0552 0582 0553 0583 0554 0584 0555 0585 0556 0586 2019 0027
diff --git a/sql/share/charsets/cp1251.conf b/sql/share/charsets/cp1251.conf
deleted file mode 100644
index ee72c6e7b27..00000000000
--- a/sql/share/charsets/cp1251.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-# Configuration file for the cp1251 character set
-
-# 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 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 00 00
- 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00
- 00 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00
- 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 F6 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 D6 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 7C 7D 7E 7F 80
- 81 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 82 83 84 85 FF
- FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
- FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
- FF FF FF FF FF FF FF FF 61 FF FF FF FF FF FF FF
- FF FF FF FF FF FF FF FF 61 FF FF FF FF FF FF FF
- 5B 5C 5D 5E 5F 60 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
- 5B 5C 5D 5E 5F 60 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
-
-# Unicode mapping (must be 256 elements)
- 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
- 0402 0403 201A 0453 201E 2026 2020 2021 0000 2030 0409 2039 040A 040C 040B 040F
- 0452 2018 2019 201C 201D 2022 2013 2014 0000 2122 0459 203A 045A 045C 045B 045F
- 00A0 040E 045E 0408 00A4 0490 00A6 00A7 0401 00A9 0404 00AB 00AC 00AD 00AE 0407
- 00B0 00B1 0406 0456 0491 00B5 00B6 00B7 0451 2116 0454 00BB 0458 0405 0455 0457
- 0410 0411 0412 0413 0414 0415 0416 0417 0418 0419 041A 041B 041C 041D 041E 041F
- 0420 0421 0422 0423 0424 0425 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F
- 0430 0431 0432 0433 0434 0435 0436 0437 0438 0439 043A 043B 043C 043D 043E 043F
- 0440 0441 0442 0443 0444 0445 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F
-
diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml
index 5421e3449da..48c525eb797 100644
--- a/sql/share/charsets/cp1251.xml
+++ b/sql/share/charsets/cp1251.xml
@@ -161,6 +161,13 @@
+