Commit 8ee5b216 authored by unknown's avatar unknown
Browse files

Preparation for user-defined Unicode collations:

weights data now comes from a static variables
but from the charset structure. 

parent 6c09db27
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ typedef struct my_charset_handler_st
} MY_CHARSET_HANDLER;

extern MY_CHARSET_HANDLER my_charset_8bit_handler;

extern MY_CHARSET_HANDLER my_charset_ucs2_handler;


typedef struct charset_info_st
@@ -204,6 +204,7 @@ typedef struct charset_info_st
  uchar    *to_lower;
  uchar    *to_upper;
  uchar    *sort_order;
  uint16   **sort_order_big;
  uint16      *tab_to_uni;
  MY_UNI_IDX  *tab_from_uni;
  uchar state_map[256];
+2 −1
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ static my_bool init_available_charsets(myf myflags)
      if (*cs)
      {
        set_max_sort_char(*cs);
        if (cs[0]->ctype)
          init_state_maps(*cs);
      }
    }
+2 −0
Original line number Diff line number Diff line
@@ -6317,6 +6317,7 @@ CHARSET_INFO my_charset_big5_chinese_ci=
    to_lower_big5,
    to_upper_big5,
    sort_order_big5,
    NULL,		/* sort_order_big*/
    NULL,		/* tab_to_uni   */
    NULL,		/* tab_from_uni */
    "",
@@ -6342,6 +6343,7 @@ CHARSET_INFO my_charset_big5_bin=
    to_lower_big5,
    to_upper_big5,
    sort_order_big5,
    NULL,		/* sort_order_big*/
    NULL,		/* tab_to_uni   */
    NULL,		/* tab_from_uni */
    "",
+3 −1
Original line number Diff line number Diff line
@@ -384,7 +384,9 @@ CHARSET_INFO my_charset_bin =
    bin_char_array,		/* sort_order    */
    NULL,			/* tab_to_uni    */
    NULL,			/* tab_from_uni  */
    "","",
    NULL,			/* sort_order_big*/
    "",
    "",
    1,				/* strxfrm_multiply */
    1,				/* mbminlen      */
    1,				/* mbmaxlen      */
+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ CHARSET_INFO my_charset_latin2_czech_ci =
    to_lower_czech,
    to_upper_czech,
    sort_order_czech,
    NULL,		/* sort_order_big*/
    tab_8859_2_uni,	/* tab_to_uni   */
    idx_uni_8859_2,	/* tab_from_uni */
    "","",
Loading