summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/charset-def.c23
-rw-r--r--mysys/charset.c654
-rw-r--r--mysys/mf_iocache.c1
-rw-r--r--mysys/mf_iocache2.c1
-rw-r--r--mysys/mf_keycache.c1
-rw-r--r--mysys/my_bitmap.c1
-rw-r--r--mysys/my_error.c70
-rw-r--r--mysys/my_gethostbyname.c1
-rw-r--r--mysys/my_getopt.c1
-rw-r--r--mysys/my_pthread.c1
-rw-r--r--mysys/my_seek.c1
-rw-r--r--mysys/rijndael.c1
-rw-r--r--mysys/thr_alarm.c1
13 files changed, 121 insertions, 636 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index a89cf866933..4f988608d13 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.c
@@ -22,6 +22,19 @@
init_compiled_charsets() that only adds those that he wants
*/
+#ifdef HAVE_CHARSET_ucs2
+extern CHARSET_INFO my_charset_ucs2_general_uca;
+extern CHARSET_INFO my_charset_ucs2_icelandic_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_latvian_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_romanian_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_slovenian_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_polish_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_estonian_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_spanish_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_swedish_uca_ci;
+extern CHARSET_INFO my_charset_ucs2_turkish_uca_ci;
+#endif
+
my_bool init_compiled_charsets(myf flags __attribute__((unused)))
{
CHARSET_INFO *cs;
@@ -74,6 +87,16 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
add_compiled_collation(&my_charset_ucs2_general_ci);
add_compiled_collation(&my_charset_ucs2_bin);
add_compiled_collation(&my_charset_ucs2_general_uca);
+ add_compiled_collation(&my_charset_ucs2_general_uca);
+ add_compiled_collation(&my_charset_ucs2_icelandic_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_latvian_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_romanian_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_slovenian_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_polish_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_estonian_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_spanish_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_swedish_uca_ci);
+ add_compiled_collation(&my_charset_ucs2_turkish_uca_ci);
#endif
#ifdef HAVE_CHARSET_ujis
diff --git a/mysys/charset.c b/mysys/charset.c
index 7eccf2dab68..72f102a2296 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -23,354 +23,6 @@
/*
- Collation language is implemented according to
- subset of ICU Collation Customization (tailorings):
- http://oss.software.ibm.com/icu/userguide/Collate_Customization.html
-
- Collation language elements:
- Delimiters:
- space - skipped
-
- <char> := A-Z | a-z | \uXXXX
-
- Shift command:
- <shift> := & - reset at this letter.
-
- Diff command:
- <d1> := < - Identifies a primary difference.
- <d2> := << - Identifies a secondary difference.
- <d3> := <<< - Idenfifies a tertiary difference.
-
-
- Collation rules:
- <ruleset> := <rule> { <ruleset> }
-
- <rule> := <d1> <string>
- | <d2> <string>
- | <d3> <string>
- | <shift> <char>
-
- <string> := <char> [ <string> ]
-
- An example, Polish collation:
-
- &A < \u0105 <<< \u0104
- &C < \u0107 <<< \u0106
- &E < \u0119 <<< \u0118
- &L < \u0142 <<< \u0141
- &N < \u0144 <<< \u0143
- &O < \u00F3 <<< \u00D3
- &S < \u015B <<< \u015A
- &Z < \u017A <<< \u017B
-*/
-
-
-typedef enum my_coll_lexem_num_en
-{
- MY_COLL_LEXEM_EOF = 0,
- MY_COLL_LEXEM_DIFF = 1,
- MY_COLL_LEXEM_SHIFT = 4,
- MY_COLL_LEXEM_CHAR = 5,
- MY_COLL_LEXEM_ERROR = 6
-} my_coll_lexem_num;
-
-
-typedef struct my_coll_lexem_st
-{
- const char *beg;
- const char *end;
- const char *prev;
- int diff;
- int code;
-} MY_COLL_LEXEM;
-
-
-/*
- Initialize collation rule lexical anilizer
-
- SYNOPSIS
- my_coll_lexem_init
- lexem Lex analizer to init
- str Const string to parse
- strend End of the string
- USAGE
-
- RETURN VALUES
- N/A
-*/
-
-static void my_coll_lexem_init(MY_COLL_LEXEM *lexem,
- const char *str, const char *strend)
-{
- lexem->beg= str;
- lexem->prev= str;
- lexem->end= strend;
- lexem->diff= 0;
- lexem->code= 0;
-}
-
-
-/*
- Print collation customization expression parse error, with context.
-
- SYNOPSIS
- my_coll_lexem_print_error
- lexem Lex analizer to take context from
- errstr sting to write error to
- errsize errstr size
- txt error message
- USAGE
-
- RETURN VALUES
- N/A
-*/
-
-static void my_coll_lexem_print_error(MY_COLL_LEXEM *lexem,
- char *errstr, size_t errsize,
- const char *txt)
-{
- char tail[30];
- size_t len= lexem->end - lexem->prev;
- strmake (tail, lexem->prev, min(len, sizeof(tail)-1));
- errstr[errsize-1]= '\0';
- my_snprintf(errstr,errsize-1,"%s at '%s'", txt, tail);
-}
-
-
-/*
- Convert a hex digit into its numeric value
-
- SYNOPSIS
- ch2x
- ch hex digit to convert
- USAGE
-
- RETURN VALUES
- an integer value in the range 0..15
- -1 on error
-*/
-
-static int ch2x(int ch)
-{
- if (ch >= '0' && ch <= '9')
- return ch - '0';
-
- if (ch >= 'a' && ch <= 'f')
- return 10 + ch - 'a';
-
- if (ch >= 'A' && ch <= 'F')
- return 10 + ch - 'A';
-
- return -1;
-}
-
-
-/*
- Collation language lexical parser:
- Scans the next lexem.
-
- SYNOPSIS
- my_coll_lexem_next
- lexem Lex analizer, previously initialized by
- my_coll_lexem_init.
- USAGE
- Call this function in a loop
-
- RETURN VALUES
- Lexem number: eof, diff, shift, char or error.
-*/
-
-static my_coll_lexem_num my_coll_lexem_next(MY_COLL_LEXEM *lexem)
-{
- for ( ;lexem->beg < lexem->end ; lexem->beg++)
- {
- lexem->prev= lexem->beg;
- if (lexem->beg[0] == ' ' || lexem->beg[0] == '\t' ||
- lexem->beg[0] == '\r' || lexem->beg[0] == '\n')
- continue;
-
- if (lexem->beg[0] == '&')
- {
- lexem->beg++;
- return MY_COLL_LEXEM_SHIFT;
- }
-
- if (lexem->beg[0] == '<')
- {
- for (lexem->beg++, lexem->diff=1;
- (lexem->beg < lexem->end) &&
- (lexem->beg[0] == '<') && (lexem->diff<3);
- lexem->beg++, lexem->diff++);
- return MY_COLL_LEXEM_DIFF;
- }
-
- if ((lexem->beg[0] >= 'a' && lexem->beg[0] <= 'z') ||
- (lexem->beg[0] >= 'A' && lexem->beg[0] <= 'Z'))
- {
- lexem->code= lexem->beg[0];
- lexem->beg++;
- return MY_COLL_LEXEM_CHAR;
- }
-
- if ((lexem->beg[0] == '\\') &&
- (lexem->beg+2 < lexem->end) &&
- (lexem->beg[1] == 'u'))
- {
- int ch;
-
- lexem->code= 0;
- for (lexem->beg+=2;
- (lexem->beg < lexem->end) && ((ch= ch2x(lexem->beg[0])) >= 0) ;
- lexem->beg++)
- {
- lexem->code= (lexem->code << 4) + ch;
- }
- return MY_COLL_LEXEM_CHAR;
- }
-
- return MY_COLL_LEXEM_ERROR;
- }
- return MY_COLL_LEXEM_EOF;
-}
-
-
-/*
- Collation rule item
-*/
-
-typedef struct my_coll_rule_item_st
-{
- uint base; /* Base character */
- uint curr; /* Current character */
- int diff[3]; /* Primary, Secondary and Tertiary difference */
-} MY_COLL_RULE;
-
-
-/*
- Collation language syntax parser.
- Uses lexical parser.
-
- SYNOPSIS
- my_coll_rule_parse
- rule Collation rule list to load to.
- str A string containin collation language expression.
- strend End of the string.
- USAGE
-
- RETURN VALUES
- 0 - OK
- 1 - ERROR, e.g. too many items.
-*/
-
-static int my_coll_rule_parse(MY_COLL_RULE *rule, size_t mitems,
- const char *str, const char *strend,
- char *errstr, size_t errsize)
-{
- MY_COLL_LEXEM lexem;
- my_coll_lexem_num lexnum;
- my_coll_lexem_num prevlexnum= MY_COLL_LEXEM_ERROR;
- MY_COLL_RULE item;
- int state= 0;
- size_t nitems= 0;
-
- /* Init all variables */
- errstr[0]= '\0';
- bzero(&item, sizeof(item));
- my_coll_lexem_init(&lexem, str, strend);
-
- while ((lexnum= my_coll_lexem_next(&lexem)))
- {
- if (lexnum == MY_COLL_LEXEM_ERROR)
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"Unknown character");
- return -1;
- }
-
- switch (state) {
- case 0:
- if (lexnum != MY_COLL_LEXEM_SHIFT)
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"& expected");
- return -1;
- }
- prevlexnum= lexnum;
- state= 2;
- continue;
-
- case 1:
- if (lexnum != MY_COLL_LEXEM_SHIFT && lexnum != MY_COLL_LEXEM_DIFF)
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"& or < expected");
- return -1;
- }
- prevlexnum= lexnum;
- state= 2;
- continue;
-
- case 2:
- if (lexnum != MY_COLL_LEXEM_CHAR)
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"character expected");
- return -1;
- }
-
- if (prevlexnum == MY_COLL_LEXEM_SHIFT)
- {
- item.base= lexem.code;
- item.diff[0]= 0;
- item.diff[1]= 0;
- item.diff[2]= 0;
- }
- else if (prevlexnum == MY_COLL_LEXEM_DIFF)
- {
- item.curr= lexem.code;
- if (lexem.diff == 3)
- {
- item.diff[2]++;
- }
- else if (lexem.diff == 2)
- {
- item.diff[1]++;
- item.diff[2]= 0;
- }
- else if (lexem.diff == 1)
- {
- item.diff[0]++;
- item.diff[1]= 0;
- item.diff[2]= 0;
- }
- if (nitems >= mitems)
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"Too many rules");
- return -1;
- }
- rule[nitems++]= item;
- }
- else
- {
- my_coll_lexem_print_error(&lexem,errstr,errsize-1,"Should never happen");
- return -1;
- }
- state= 1;
- continue;
- }
- }
- return (size_t) nitems;
-}
-
-
-typedef struct
-{
- int nchars;
- MY_UNI_IDX uidx;
-} uni_idx;
-
-#define PLANE_SIZE 0x100
-#define PLANE_NUM 0x100
-#define PLANE_NUMBER(x) (((x)>>8) % PLANE_NUM)
-
-
-/*
The code below implements this functionality:
- Initializing charset related structures
@@ -386,32 +38,21 @@ 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 void init_state_maps(CHARSET_INFO *cs)
+static my_bool init_state_maps(CHARSET_INFO *cs)
{
uint i;
- uchar *state_map= cs->state_map;
- uchar *ident_map= cs->ident_map;
+ uchar *state_map;
+ uchar *ident_map;
+
+ if (!(cs->state_map= (uchar*) my_once_alloc(256, MYF(MY_WME))))
+ return 1;
+
+ if (!(cs->ident_map= (uchar*) my_once_alloc(256, MYF(MY_WME))))
+ return 1;
+ state_map= cs->state_map;
+ ident_map= cs->ident_map;
+
/* Fill state_map with states to get a faster parser */
for (i=0; i < 256 ; i++)
{
@@ -458,6 +99,7 @@ static void init_state_maps(CHARSET_INFO *cs)
state_map[(uchar)'x']= state_map[(uchar)'X']= (uchar) MY_LEX_IDENT_OR_HEX;
state_map[(uchar)'b']= state_map[(uchar)'b']= (uchar) MY_LEX_IDENT_OR_BIN;
state_map[(uchar)'n']= state_map[(uchar)'N']= (uchar) MY_LEX_IDENT_OR_NCHAR;
+ return 0;
}
@@ -469,98 +111,11 @@ static void simple_cs_init_functions(CHARSET_INFO *cs)
cs->coll= &my_collation_8bit_simple_ci_handler;
cs->cset= &my_charset_8bit_handler;
- cs->mbminlen= 1;
- cs->mbmaxlen= 1;
}
-static int pcmp(const void * f, const void * s)
-{
- const uni_idx *F= (const uni_idx*) f;
- const uni_idx *S= (const uni_idx*) s;
- int res;
-
- if (!(res=((S->nchars)-(F->nchars))))
- res=((F->uidx.from)-(S->uidx.to));
- return res;
-}
-
-static my_bool create_fromuni(CHARSET_INFO *cs)
-{
- uni_idx idx[PLANE_NUM];
- int i,n;
-
- /* Clear plane statistics */
- bzero(idx,sizeof(idx));
-
- /* Count number of characters in each plane */
- for (i=0; i< 0x100; i++)
- {
- uint16 wc=cs->tab_to_uni[i];
- int pl= PLANE_NUMBER(wc);
-
- if (wc || !i)
- {
- if (!idx[pl].nchars)
- {
- idx[pl].uidx.from=wc;
- idx[pl].uidx.to=wc;
- }else
- {
- idx[pl].uidx.from=wc<idx[pl].uidx.from?wc:idx[pl].uidx.from;
- idx[pl].uidx.to=wc>idx[pl].uidx.to?wc:idx[pl].uidx.to;
- }
- idx[pl].nchars++;
- }
- }
-
- /* Sort planes in descending order */
- qsort(&idx,PLANE_NUM,sizeof(uni_idx),&pcmp);
-
- for (i=0; i < PLANE_NUM; i++)
- {
- int ch,numchars;
-
- /* Skip empty plane */
- if (!idx[i].nchars)
- break;
-
- numchars=idx[i].uidx.to-idx[i].uidx.from+1;
- if (!(idx[i].uidx.tab=(uchar*) my_once_alloc(numchars *
- sizeof(*idx[i].uidx.tab),
- MYF(MY_WME))))
- return TRUE;
-
- bzero(idx[i].uidx.tab,numchars*sizeof(*idx[i].uidx.tab));
-
- for (ch=1; ch < PLANE_SIZE; ch++)
- {
- uint16 wc=cs->tab_to_uni[ch];
- if (wc >= idx[i].uidx.from && wc <= idx[i].uidx.to && wc)
- {
- int ofs= wc - idx[i].uidx.from;
- idx[i].uidx.tab[ofs]= ch;
- }
- }
- }
-
- /* Allocate and fill reverse table for each plane */
- n=i;
- if (!(cs->tab_from_uni= (MY_UNI_IDX*) my_once_alloc(sizeof(MY_UNI_IDX)*(n+1),
- MYF(MY_WME))))
- return TRUE;
-
- for (i=0; i< n; i++)
- cs->tab_from_uni[i]= idx[i].uidx;
-
- /* Set end-of-list marker */
- bzero(&cs->tab_from_uni[i],sizeof(MY_UNI_IDX));
- return FALSE;
-}
-
-
-static int simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
+static int cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
{
to->number= from->number ? from->number : to->number;
@@ -582,7 +137,8 @@ static int simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
MY_CS_CTYPE_TABLE_SIZE,
MYF(MY_WME))))
goto err;
- init_state_maps(to);
+ if (init_state_maps(to))
+ goto err;
}
if (from->to_lower)
if (!(to->to_lower= (uchar*) my_once_memdup((char*) from->to_lower,
@@ -601,7 +157,7 @@ static int simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
MY_CS_SORT_ORDER_TABLE_SIZE,
MYF(MY_WME))))
goto err;
- set_max_sort_char(to);
+
}
if (from->tab_to_uni)
{
@@ -609,11 +165,10 @@ static int simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
if (!(to->tab_to_uni= (uint16*) my_once_memdup((char*)from->tab_to_uni,
sz, MYF(MY_WME))))
goto err;
- if (create_fromuni(to))
- goto err;
}
- to->mbminlen= 1;
- to->mbmaxlen= 1;
+ if (from->tailoring)
+ if (!(to->tailoring= my_once_strdup(from->tailoring,MYF(MY_WME))))
+ goto err;
return 0;
@@ -622,143 +177,6 @@ err:
}
-#ifdef HAVE_CHARSET_ucs2
-
-#define MY_MAX_COLL_RULE 64
-
-/*
- This function copies an UCS2 collation from
- the default Unicode Collation Algorithm (UCA)
- weights applying tailorings, i.e. a set of
- alternative weights for some characters.
-
- The default UCA weights are stored in my_charset_ucs2_general_uca.
- They consist of 256 pages, 256 character each.
-
- If a page is not overwritten by tailoring rules,
- it is copies as is from UCA as is.
-
- If a page contains some overwritten characters, it is
- allocated. Untouched characters are copied from the
- default weights.
-*/
-
-static int ucs2_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
-{
- MY_COLL_RULE rule[MY_MAX_COLL_RULE];
- char errstr[128];
- uchar *newlengths;
- uint16 **newweights;
- const uchar *deflengths= my_charset_ucs2_general_uca.sort_order;
- uint16 **defweights= my_charset_ucs2_general_uca.sort_order_big;
- int rc, i;
-
- to->number= from->number ? from->number : to->number;
-
- if (from->csname)
- if (!(to->csname= my_once_strdup(from->csname,MYF(MY_WME))))
- goto err;
-
- if (from->name)
- if (!(to->name= my_once_strdup(from->name,MYF(MY_WME))))
- goto err;
-
- if (from->comment)
- if (!(to->comment= my_once_strdup(from->comment,MYF(MY_WME))))
- goto err;
-
- to->strxfrm_multiply= my_charset_ucs2_general_uca.strxfrm_multiply;
- to->min_sort_char= my_charset_ucs2_general_uca.min_sort_char;
- to->max_sort_char= my_charset_ucs2_general_uca.max_sort_char;
- to->mbminlen= 2;
- to->mbmaxlen= 2;
-
-
- /* Parse ICU Collation Customization expression */
- if ((rc= my_coll_rule_parse(rule, MY_MAX_COLL_RULE,
- from->sort_order,
- from->sort_order + strlen(from->sort_order),
- errstr, sizeof(errstr))) <= 0)
- {
- /*
- TODO: add error message reporting.
- printf("Error: %d '%s'\n", rc, errstr);
- */
- return 1;
- }
-
-
- if (!(newweights= (uint16**) my_once_alloc(256*sizeof(uint16*),MYF(MY_WME))))
- goto err;
- bzero(newweights, 256*sizeof(uint16*));
-
- if (!(newlengths= (uchar*) my_once_memdup(deflengths,256,MYF(MY_WME))))
- goto err;
-
- /*
- Calculate maximum lenghts for the pages
- which will be overwritten.
- */
- for (i=0; i < rc; i++)
- {
- uint pageb= (rule[i].base >> 8) & 0xFF;
- uint pagec= (rule[i].curr >> 8) & 0xFF;
-
- if (newlengths[pagec] < deflengths[pageb])
- newlengths[pagec]= deflengths[pageb];
- }
-
- for (i=0; i < rc; i++)
- {
- uint pageb= (rule[i].base >> 8) & 0xFF;
- uint pagec= (rule[i].curr >> 8) & 0xFF;
- uint chb, chc;
-
- if (!newweights[pagec])
- {
- /* Alloc new page and copy the default UCA weights */
- uint size= 256*newlengths[pagec]*sizeof(uint16);
-
- if (!(newweights[pagec]= (uint16*) my_once_alloc(size,MYF(MY_WME))))
- goto err;
- bzero((void*) newweights[pagec], size);
-
- for (chc=0 ; chc < 256; chc++)
- {
- memcpy(newweights[pagec] + chc*newlengths[pagec],
- defweights[pagec] + chc*deflengths[pagec],
- deflengths[pagec]*sizeof(uint16));
- }
- }
-
- /*
- Aply the alternative rule:
- shift to the base character and primary difference.
- */
- chc= rule[i].curr & 0xFF;
- chb= rule[i].base & 0xFF;
- memcpy(newweights[pagec] + chc*newlengths[pagec],
- defweights[pageb] + chb*deflengths[pageb],
- deflengths[pageb]*sizeof(uint16));
- /* Apply primary difference */
- newweights[pagec][chc*newlengths[pagec]]+= rule[i].diff[0];
- }
-
- /* Copy non-overwritten pages from the default UCA weights */
- for (i= 0; i < 256 ; i++)
- if (!newweights[i])
- newweights[i]= defweights[i];
-
- to->sort_order= newlengths;
- to->sort_order_big= newweights;
-
- return 0;
-
-err:
- return 1;
-}
-#endif
-
static my_bool simple_cs_is_full(CHARSET_INFO *cs)
{
@@ -791,22 +209,28 @@ static int add_collation(CHARSET_INFO *cs)
if (!(all_charsets[cs->number]->state & MY_CS_COMPILED))
{
+ CHARSET_INFO *new= all_charsets[cs->number];
+ if (cs_copy_data(all_charsets[cs->number],cs))
+ return MY_XML_ERROR;
+
if (!strcmp(cs->csname,"ucs2") )
{
#ifdef HAVE_CHARSET_ucs2
- CHARSET_INFO *new= all_charsets[cs->number];
new->cset= my_charset_ucs2_general_uca.cset;
new->coll= my_charset_ucs2_general_uca.coll;
- if (ucs2_copy_data(new, cs))
- return MY_XML_ERROR;
+ new->strxfrm_multiply= my_charset_ucs2_general_uca.strxfrm_multiply;
+ new->min_sort_char= my_charset_ucs2_general_uca.min_sort_char;
+ new->max_sort_char= my_charset_ucs2_general_uca.max_sort_char;
+ new->mbminlen= 2;
+ new->mbmaxlen= 2;
new->state |= MY_CS_AVAILABLE | MY_CS_LOADED;
#endif
}
else
{
simple_cs_init_functions(all_charsets[cs->number]);
- if (simple_cs_copy_data(all_charsets[cs->number],cs))
- return MY_XML_ERROR;
+ new->mbminlen= 1;
+ new->mbmaxlen= 1;
if (simple_cs_is_full(all_charsets[cs->number]))
{
all_charsets[cs->number]->state |= MY_CS_LOADED;
@@ -922,6 +346,10 @@ void add_compiled_collation(CHARSET_INFO *cs)
cs->state|= MY_CS_AVAILABLE;
}
+static void *cs_alloc(uint size)
+{
+ return my_once_alloc(size, MYF(MY_WME));
+}
#ifdef __NETWARE__
@@ -955,9 +383,9 @@ static my_bool init_available_charsets(myf myflags)
{
if (*cs)
{
- set_max_sort_char(*cs);
if (cs[0]->ctype)
- init_state_maps(*cs);
+ if (init_state_maps(*cs))
+ *cs= NULL;
}
}
@@ -1042,6 +470,14 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL;
}
pthread_mutex_unlock(&THR_LOCK_charset);
+ if (cs && !(cs->state & MY_CS_READY))
+ {
+ if ((cs->cset->init && cs->cset->init(cs, cs_alloc)) ||
+ (cs->coll->init && cs->coll->init(cs, cs_alloc)))
+ cs= NULL;
+ else
+ cs->state|= MY_CS_READY;
+ }
return cs;
}
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 7b5371c4289..f16f2b7ab72 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -55,7 +55,6 @@ TODO:
#include "mysys_err.h"
static void my_aiowait(my_aio_result *result);
#endif
-#include <assert.h>
#include <errno.h>
#ifdef THREAD
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index 70b2f288538..3755bcdb53d 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.c
@@ -23,7 +23,6 @@
#include <m_string.h>
#include <stdarg.h>
#include <m_ctype.h>
-#include <assert.h>
my_off_t my_b_append_tell(IO_CACHE* info)
{
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 168483f276b..32b3154b8ed 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -44,7 +44,6 @@
#include "my_static.h"
#include <m_string.h>
#include <errno.h>
-#include <assert.h>
#include <stdarg.h>
/*
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 0f8984e6b3d..3a09255b0b0 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -35,7 +35,6 @@
#include "mysys_priv.h"
#include <my_bitmap.h>
-#include <assert.h>
#include <m_string.h>
diff --git a/mysys/my_error.c b/mysys/my_error.c
index 9789de9d58a..8a377f63c7e 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -33,6 +33,12 @@ char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
nr Errno
MyFlags Flags
... variable list
+ NOTE
+ The following subset of printf format is supported:
+ "%[0-9.-]*l?[sdu]", where all length flags are parsed but ignored.
+
+ Additionally "%.*s" is supported and "%.*[ud]" is correctly parsed but
+ the length value is ignored.
*/
int my_error(int nr,myf MyFlags, ...)
@@ -43,7 +49,10 @@ int my_error(int nr,myf MyFlags, ...)
reg2 char *endpos;
char * par;
char ebuff[ERRMSGSIZE+20];
+ int prec_chars; /* output precision */
+ my_bool prec_supplied;
DBUG_ENTER("my_error");
+ LINT_INIT(prec_chars); /* protected by prec_supplied */
va_start(ap,MyFlags);
DBUG_PRINT("my", ("nr: %d MyFlags: %d errno: %d", nr, MyFlags, errno));
@@ -59,7 +68,6 @@ int my_error(int nr,myf MyFlags, ...)
if (tpos[0] != '%')
{
*endpos++= *tpos++; /* Copy ordinary char */
- olen++;
continue;
}
if (*++tpos == '%') /* test if %% */
@@ -68,43 +76,71 @@ int my_error(int nr,myf MyFlags, ...)
}
else
{
- /* Skip if max size is used (to be compatible with printf) */
- while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' || *tpos == '-')
- tpos++;
- if (*tpos == 'l') /* Skip 'l' argument */
- tpos++;
+ /*
+ Skip size/precision flags to be compatible with printf.
+ The only size/precision flag supported is "%.*s".
+ If "%.*u" or "%.*d" are encountered, the precision number is read
+ from the variable argument list but its value is ignored.
+ */
+ prec_supplied= 0;
+ if (*tpos== '.')
+ {
+ tpos++;
+ olen--;
+ if (*tpos == '*')
+ {
+ tpos++;
+ olen--;
+ prec_chars= va_arg(ap, int); /* get length parameter */
+ prec_supplied= 1;
+ }
+ }
+
+ if (!prec_supplied)
+ {
+ while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' ||
+ *tpos == '-')
+ tpos++;
+
+ if (*tpos == 'l') /* Skip 'l' argument */
+ tpos++;
+ }
+
if (*tpos == 's') /* String parameter */
{
- par = va_arg(ap, char *);
- plen = (uint) strlen(par);
+ par= va_arg(ap, char *);
+ plen= (uint) strlen(par);
+ if (prec_supplied && prec_chars > 0)
+ plen= min((uint)prec_chars, plen);
if (olen + plen < ERRMSGSIZE+2) /* Replace if possible */
{
- endpos=strmov(endpos,par);
- tpos++;
- olen+=plen-2;
- continue;
+ strmake(endpos, par, plen);
+ endpos+= plen;
+ tpos++;
+ olen+= plen-2;
+ continue;
}
}
else if (*tpos == 'd' || *tpos == 'u') /* Integer parameter */
{
register int iarg;
- iarg = va_arg(ap, int);
+ iarg= va_arg(ap, int);
if (*tpos == 'd')
plen= (uint) (int10_to_str((long) iarg, endpos, -10) - endpos);
else
plen= (uint) (int10_to_str((long) (uint) iarg, endpos, 10) - endpos);
if (olen + plen < ERRMSGSIZE+2) /* Replace parameter if possible */
{
- endpos+=plen;
+ endpos+= plen;
tpos++;
- olen+=plen-2;
+ olen+= plen-2;
continue;
}
}
}
- *endpos++='%'; /* % used as % or unknown code */
+ *endpos++= '%'; /* % used as % or unknown code */
}
- *endpos='\0'; /* End of errmessage */
+ *endpos= '\0'; /* End of errmessage */
va_end(ap);
DBUG_RETURN((*error_handler_hook)(nr, ebuff, MyFlags));
}
diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c
index 5044a505054..27281f3489d 100644
--- a/mysys/my_gethostbyname.c
+++ b/mysys/my_gethostbyname.c
@@ -18,7 +18,6 @@
/* Thread safe version of gethostbyname_r() */
#include "mysys_priv.h"
-#include <assert.h>
#if !defined(MSDOS) && !defined(__WIN__)
#include <netdb.h>
#endif
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 8d0b05d55f7..d7a9babe5e7 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -18,7 +18,6 @@
#include <m_string.h>
#include <stdlib.h>
#include <my_getopt.h>
-#include <assert.h>
#include <my_sys.h>
#include <mysys_err.h>
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index d721418ffa1..37517fb8327 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -23,7 +23,6 @@
#include <signal.h>
#include <m_string.h>
#include <thr_alarm.h>
-#include <assert.h>
#if (defined(__BSD__) || defined(_BSDI_VERSION)) && !defined(HAVE_mit_thread)
#define SCHED_POLICY SCHED_RR
diff --git a/mysys/my_seek.c b/mysys/my_seek.c
index ec24a26b3d9..6af65d70fd0 100644
--- a/mysys/my_seek.c
+++ b/mysys/my_seek.c
@@ -15,7 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "mysys_priv.h"
-#include <assert.h>
/* Seek to position in file */
/*ARGSUSED*/
diff --git a/mysys/rijndael.c b/mysys/rijndael.c
index dd0c45445d5..43cd14101ca 100644
--- a/mysys/rijndael.c
+++ b/mysys/rijndael.c
@@ -26,7 +26,6 @@
*/
#include <my_global.h>
-#include <assert.h>
#include "rijndael.h"
/*
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 54aa4d421f6..84a8e779ae1 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -27,7 +27,6 @@
#include <m_string.h>
#include <queues.h>
#include "thr_alarm.h"
-#include <assert.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> /* AIX needs this for fd_set */
View Lorry Controller Status