summaryrefslogtreecommitdiff
path: root/mysys/charset.c
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-06-11 17:50:20 +0500
committerbar@mysql.com <>2004-06-11 17:50:20 +0500
commitf8b15e8bb6a87a3663d7703b40fbc7f0a1f8691a (patch)
treed6e5fc84dbea8d1d3561e08214c0a32dcc1b639f /mysys/charset.c
parentc64d93b27403dc9d154eb601b88d95964f9fc05b (diff)
downloadmariadb-git-f8b15e8bb6a87a3663d7703b40fbc7f0a1f8691a.tar.gz
Initialize max_sort_char only if a character set is requested.
Diffstat (limited to 'mysys/charset.c')
-rw-r--r--mysys/charset.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index 165fa19e3d5..d7aabee68f3 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -38,26 +38,6 @@ my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2)
}
-static void set_max_sort_char(CHARSET_INFO *cs)
-{
- uchar max_char;
- uint i;
-
- if (!cs->sort_order)
- return;
-
- max_char=cs->sort_order[(uchar) cs->max_sort_char];
- for (i= 0; i < 256; i++)
- {
- if ((uchar) cs->sort_order[i] > max_char)
- {
- max_char=(uchar) cs->sort_order[i];
- cs->max_sort_char= i;
- }
- }
-}
-
-
static my_bool init_state_maps(CHARSET_INFO *cs)
{
uint i;
@@ -180,8 +160,6 @@ static int simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
MYF(MY_WME))))
goto err;
-
- set_max_sort_char(to);
}
if (from->tab_to_uni)
{
@@ -577,7 +555,6 @@ static my_bool init_available_charsets(myf myflags)
{
if (*cs)
{
- set_max_sort_char(*cs);
if (cs[0]->ctype)
if (init_state_maps(*cs))
*cs= NULL;