mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 02:16:32 +01:00 
			
		
		
		
	 10c063f9f0
			
		
	
	
	10c063f9f0
	
	
	
		
			
			Fixing the code adding MySQL _0900_ collations as _uca1400_ aliases
not to perform deep initialization of the corresponding _uca1400_
collations.
Only basic initialization is now performed which allows to watch
these collations (both _0900_ and _uca1400_) in queries to
INFORMATION_SCHEMA tables COLLATIONS and
COLLATION_CHARACTER_SET_APPLICABILITY,
as well as in SHOW COLLATION statements.
Deep initialization is now performed only when a collation
(either the _0900_ alias or the corresponding  _uca1400_ collation)
is used for the very first time after the server startup.
Refactoring was done to maintain the code easier:
- most of the _uca1400_ code was moved from ctype-uca.c
  to a new file ctype-uca1400.c
- most of the _0900_ code was moved from type-uca.c
  to a new file ctype-uca0900.c
Change details:
- The original function add_alias_for_collation() added by the patch for
   "MDEV-20912 Add support for utf8mb4_0900_* collations in MariaDB Server"
  was removed from mysys/charset.c, as it had two two problems:
  a. it forced deep initialization of the _uca1400_ collations
     when adding _0900_ aliases for them at the server startup
     (the main reported problem)
  b. the collation initialization code in add_alias_for_collation()
     was related more to collations rather than to memory management,
     so /strings should be a better place for it than /mysys.
  The code from add_alias_for_collation() was split into separate functions.
  Cyclic dependency was removed. `#include <my_sys.h>` was removed
  from /strings/ctype-uca.c. Collations are now added using a callback
  function MY_CHARSET_LOADED::add_collation, like it is done for
  user collations defined in Index.xml. The code in /mysys sets
  MY_CHARSET_LOADED::add_collation to add_compiled_collation().
- The function compare_collations() was removed.
  A new virtual function was added into my_collation_handler_st instead:
    my_bool (*eq_collation)(CHARSET_INFO *self, CHARSET_INFO *other);
  because it is the collation handler who knows how to detect equal
  collations by comparing only some of CHARSET_INFO members without
  their deep initialization.
  Three implementations were added:
  - my_ci_eq_collation_uca() for UCA collations, it compares
    _0900_ collations as equal to their corresponding _uca1400_ collations.
  - my_ci_eq_collation_utf8mb4_bin(), it compares
    utf8mb4_nopad_bin and utf8mb4_0900_bin as equal.
  - my_ci_eq_collation_generic() - the default implementation,
    which compares all collations as not equal.
  A C++ wrapper CHARSET_INFO::eq_collations() was added.
  The code in /sql was changes to use the wrapper instead of
  the former calls for the removed function compare_collations().
- A part of add_alias_for_collation() was moved into a new function
  my_ci_alloc(). It allocates a memory for a new charset_info_st
  instance together with the collation name and the comment using a single
  MY_CHARSET_LOADER::once_alloc call, which points to my_once_alloc()
  in the server.
- A part of add_alias_for_collation() was moved into a new function
  my_ci_make_comment_for_alias(). It makes an "Alias for xxx" string,
  e.g. "Alias for utf8mb4_uca1400_swedish_ai_ci" in case of
  utf8mb4_sv_0900_ai_ci.
- A part of the code in create_tailoring() was moved to
  a new function my_uca1400_collation_get_initialized_shared_uca(),
  to reuse the code between _uca1400_ and _0900_ collations.
- A new function my_collation_id_is_mysql_uca0900() was added
  in addition to my_collation_id_is_mysql_uca1400().
- Functions to build collation names were added:
   my_uca0900_collation_build_name()
   my_uca1400_collation_build_name()
- A shared function function was added:
  my_bool
  my_uca1400_collation_alloc_and_init(MY_CHARSET_LOADER *loader,
                                      LEX_CSTRING name,
                                      LEX_CSTRING comment,
                                      const uca_collation_def_param_t *param,
                                      uint id)
  It's reused to add _uca1400_ and _0900_ collations, with basic
  initialization (without deep initialization).
- The function add_compiled_collation() changed its return type from
  void to int, to make it compatible with MY_CHARSET_LOADER::add_collation.
- Functions mysql_uca0900_collation_definition_add(),
  mysql_uca0900_utf8mb4_collation_definitions_add(),
  mysql_utf8mb4_0900_bin_add() were added into ctype-uca0900.c.
  They get MY_CHARSET_LOADER as a parameter.
- Functions my_uca1400_collation_definition_add(),
  my_uca1400_collation_definitions_add() were moved from
  charset-def.c to strings/ctype-uca1400.c.
  The latter now accepts MY_CHARSET_LOADER as the first parameter
  instead of initializing a MY_CHARSET_LOADER inside.
- init_compiled_charsets() now initializes a MY_CHARSET_LOADER
  variable and passes it to all functions adding collations:
  - mysql_utf8mb4_0900_collation_definitions_add()
  - mysql_uca0900_utf8mb4_collation_definitions_add()
  - mysql_utf8mb4_0900_bin_add()
- A new structure was added into ctype-uca.h:
  typedef struct uca_collation_def_param
  {
    my_cs_encoding_t cs_id;
    uint tailoring_id;
    uint nopad_flags;
    uint level_flags;
  } uca_collation_def_param_t;
  It simplifies reusing the code for _uca1400_ and _0900_ collations.
- The definition of MY_UCA1400_COLLATION_DEFINITION was
  moved from ctype-uca.c to ctype-uca1400.h, to reuse
  the code for _uca1400_ and _0900_ collations.
- The definitions of "MY_UCA_INFO my_uca_v1400" and
  "MY_UCA_INFO my_uca1400_info_tailored[][]" were moved from
  ctype-uca.c to ctype-uca1400.c.
- The definitions/declarations of:
  - mysql_0900_collation_start,
  - struct mysql_0900_to_mariadb_1400_mapping
  - mysql_0900_to_mariadb_1400_mapping
  - mysql_utf8mb4_0900_collation_definitions_add()
  were moved from ctype-uca.c to ctype-uca0900.c
- Functions
  my_uca1400_make_builtin_collation_id()
  my_uca1400_collation_definition_init()
  my_uca1400_collation_id_uca400_compat()
  my_ci_get_collation_name_uca1400_context()
  were moved from ctype-uca.c to ctype-uca1400.c and ctype-uca1400.h
- A part of my_uca1400_collation_definition_init()
  was moved into my_uca0520_builtin_collation_by_id(),
  to make functions smaller.
		
	
			
		
			
				
	
	
		
			497 lines
		
	
	
	
		
			24 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			497 lines
		
	
	
	
		
			24 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 | |
| 
 | |
|    This program is free software; you can redistribute it and/or modify
 | |
|    it under the terms of the GNU General Public License as published by
 | |
|    the Free Software Foundation; version 2 of the License.
 | |
| 
 | |
|    This program is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|    GNU General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU General Public License
 | |
|    along with this program; if not, write to the Free Software
 | |
|    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 | |
| 
 | |
| #include "mysys_priv.h"
 | |
| 
 | |
| #include "../strings/ctype-uca.h"
 | |
| 
 | |
| /*
 | |
|   Include all compiled character sets into the client
 | |
|   If a client don't want to use all of them, he can define his own
 | |
|   init_compiled_charsets() that only adds those that he wants
 | |
| */
 | |
| 
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
| 
 | |
| #ifdef HAVE_CHARSET_ucs2
 | |
| extern struct charset_info_st my_charset_ucs2_german2_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_icelandic_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_latvian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_romanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_slovenian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_polish_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_estonian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_spanish_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_swedish_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_turkish_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_czech_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_danish_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_lithuanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_slovak_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_spanish2_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_roman_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_persian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_esperanto_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_hungarian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_croatian_mysql561_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_sinhala_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_unicode_520_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_vietnamese_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_croatian_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_myanmar_uca_ci;
 | |
| extern struct charset_info_st my_charset_ucs2_thai_520_w2;
 | |
| extern struct charset_info_st my_charset_ucs2_unicode_520_nopad_ci;
 | |
| #endif
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf32
 | |
| extern struct charset_info_st my_charset_utf32_german2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_icelandic_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_latvian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_romanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_slovenian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_polish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_estonian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_spanish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_swedish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_turkish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_czech_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_danish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_lithuanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_slovak_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_spanish2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_roman_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_persian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_esperanto_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_hungarian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_croatian_mysql561_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_sinhala_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_unicode_520_ci;
 | |
| extern struct charset_info_st my_charset_utf32_vietnamese_ci;
 | |
| extern struct charset_info_st my_charset_utf32_croatian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_myanmar_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf32_thai_520_w2;
 | |
| extern struct charset_info_st my_charset_utf32_unicode_520_nopad_ci;
 | |
| #endif /* HAVE_CHARSET_utf32 */
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf16
 | |
| extern struct charset_info_st my_charset_utf16_german2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_icelandic_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_latvian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_romanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_slovenian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_polish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_estonian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_spanish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_swedish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_turkish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_czech_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_danish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_lithuanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_slovak_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_spanish2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_roman_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_persian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_esperanto_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_hungarian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_croatian_mysql561_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_sinhala_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_unicode_520_ci;
 | |
| extern struct charset_info_st my_charset_utf16_vietnamese_ci;
 | |
| extern struct charset_info_st my_charset_utf16_croatian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_myanmar_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf16_thai_520_w2;
 | |
| extern struct charset_info_st my_charset_utf16_unicode_520_nopad_ci;
 | |
| #endif  /* HAVE_CHARSET_utf16 */
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf8mb3
 | |
| extern struct charset_info_st my_charset_utf8mb3_german2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_icelandic_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_latvian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_romanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_slovenian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_polish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_estonian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_spanish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_swedish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_turkish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_czech_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_danish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_lithuanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_slovak_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_spanish2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_roman_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_persian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_esperanto_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_hungarian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_croatian_mysql561_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_sinhala_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_unicode_520_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_vietnamese_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_croatian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_myanmar_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb3_thai_520_w2;
 | |
| #ifdef HAVE_UTF8_GENERAL_CS
 | |
| extern struct charset_info_st my_charset_utf8mb3_general_cs;
 | |
| #endif
 | |
| extern struct charset_info_st my_charset_utf8mb3_unicode_520_nopad_ci;
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf8mb4
 | |
| extern struct charset_info_st my_charset_utf8mb4_german2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_icelandic_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_latvian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_romanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_slovenian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_polish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_estonian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_spanish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_swedish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_turkish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_czech_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_danish_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_lithuanian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_slovak_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_spanish2_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_roman_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_persian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_esperanto_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_hungarian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_croatian_mysql561_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_sinhala_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_unicode_520_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_vietnamese_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_croatian_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_myanmar_uca_ci;
 | |
| extern struct charset_info_st my_charset_utf8mb4_thai_520_w2;
 | |
| extern struct charset_info_st my_charset_utf8mb4_unicode_520_nopad_ci;
 | |
| #endif /* HAVE_CHARSET_utf8mb4 */
 | |
| 
 | |
| #endif /* HAVE_UCA_COLLATIONS */
 | |
| 
 | |
| 
 | |
| my_bool init_compiled_charsets(myf flags __attribute__((unused)))
 | |
| {
 | |
|   CHARSET_INFO *cs;
 | |
|   MY_CHARSET_LOADER loader;
 | |
| 
 | |
|   add_compiled_collation(&my_charset_bin);
 | |
|   add_compiled_collation(&my_charset_filename);
 | |
|   
 | |
|   add_compiled_collation(&my_charset_latin1);
 | |
|   add_compiled_collation(&my_charset_latin1_nopad);
 | |
|   add_compiled_collation(&my_charset_latin1_bin);
 | |
|   add_compiled_collation(&my_charset_latin1_nopad_bin);
 | |
|   add_compiled_collation(&my_charset_latin1_german2_ci);
 | |
| 
 | |
| #ifdef HAVE_CHARSET_big5
 | |
|   add_compiled_collation(&my_charset_big5_chinese_ci);
 | |
|   add_compiled_collation(&my_charset_big5_bin);
 | |
|   add_compiled_collation(&my_charset_big5_chinese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_big5_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_cp1250
 | |
|   add_compiled_collation(&my_charset_cp1250_czech_cs);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_cp932
 | |
|   add_compiled_collation(&my_charset_cp932_japanese_ci);
 | |
|   add_compiled_collation(&my_charset_cp932_bin);
 | |
|   add_compiled_collation(&my_charset_cp932_japanese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_cp932_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_latin2
 | |
|   add_compiled_collation(&my_charset_latin2_czech_cs);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_eucjpms
 | |
|   add_compiled_collation(&my_charset_eucjpms_japanese_ci);
 | |
|   add_compiled_collation(&my_charset_eucjpms_bin);
 | |
|   add_compiled_collation(&my_charset_eucjpms_japanese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_eucjpms_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_euckr
 | |
|   add_compiled_collation(&my_charset_euckr_korean_ci);
 | |
|   add_compiled_collation(&my_charset_euckr_bin);
 | |
|   add_compiled_collation(&my_charset_euckr_korean_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_euckr_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_gb2312
 | |
|   add_compiled_collation(&my_charset_gb2312_chinese_ci);
 | |
|   add_compiled_collation(&my_charset_gb2312_bin);
 | |
|   add_compiled_collation(&my_charset_gb2312_chinese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_gb2312_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_gbk
 | |
|   add_compiled_collation(&my_charset_gbk_chinese_ci);
 | |
|   add_compiled_collation(&my_charset_gbk_bin);
 | |
|   add_compiled_collation(&my_charset_gbk_chinese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_gbk_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_sjis
 | |
|   add_compiled_collation(&my_charset_sjis_japanese_ci);
 | |
|   add_compiled_collation(&my_charset_sjis_bin);
 | |
|   add_compiled_collation(&my_charset_sjis_japanese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_sjis_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_tis620
 | |
|   add_compiled_collation(&my_charset_tis620_thai_ci);
 | |
|   add_compiled_collation(&my_charset_tis620_bin);
 | |
|   add_compiled_collation(&my_charset_tis620_thai_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_tis620_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_ucs2
 | |
|   add_compiled_collation(&my_charset_ucs2_general_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_bin);
 | |
|   add_compiled_collation(&my_charset_ucs2_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_nopad_bin);
 | |
|   add_compiled_collation(&my_charset_ucs2_general_mysql500_ci);
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
|   add_compiled_collation(&my_charset_ucs2_unicode_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_german2_uca_ci);
 | |
|   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);
 | |
|   add_compiled_collation(&my_charset_ucs2_czech_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_danish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_lithuanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_slovak_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_spanish2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_roman_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_persian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_esperanto_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_hungarian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_croatian_mysql561_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_sinhala_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_unicode_520_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_vietnamese_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_croatian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_myanmar_uca_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_thai_520_w2);
 | |
|   add_compiled_collation(&my_charset_ucs2_unicode_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_ucs2_unicode_520_nopad_ci);
 | |
| #endif
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_ujis
 | |
|   add_compiled_collation(&my_charset_ujis_japanese_ci);
 | |
|   add_compiled_collation(&my_charset_ujis_bin);
 | |
|   add_compiled_collation(&my_charset_ujis_japanese_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_ujis_nopad_bin);
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf8mb3
 | |
|   add_compiled_collation(&my_charset_utf8mb3_general_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_bin);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_nopad_bin);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_general_mysql500_ci);
 | |
| #ifdef HAVE_UTF8_GENERAL_CS
 | |
|   add_compiled_collation(&my_charset_utf8mb3_general_cs);
 | |
| #endif
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
|   add_compiled_collation(&my_charset_utf8mb3_unicode_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_german2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_icelandic_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_latvian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_romanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_slovenian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_polish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_estonian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_spanish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_swedish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_turkish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_czech_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_danish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_lithuanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_slovak_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_spanish2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_roman_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_persian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_esperanto_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_hungarian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_croatian_mysql561_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_sinhala_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_unicode_520_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_vietnamese_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_croatian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_myanmar_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_thai_520_w2);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_unicode_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb3_unicode_520_nopad_ci);
 | |
| #endif
 | |
| #endif /* HAVE_CHARSET_utf8mb3 */
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf8mb4
 | |
|   add_compiled_collation(&my_charset_utf8mb4_general_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_bin);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_nopad_bin);
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
|   add_compiled_collation(&my_charset_utf8mb4_unicode_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_german2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_icelandic_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_latvian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_romanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_slovenian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_polish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_estonian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_spanish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_swedish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_turkish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_czech_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_danish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_lithuanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_slovak_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_spanish2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_roman_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_persian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_esperanto_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_hungarian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_croatian_mysql561_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_unicode_520_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_vietnamese_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_croatian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_myanmar_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_thai_520_w2);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_unicode_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf8mb4_unicode_520_nopad_ci);
 | |
| #endif /* HAVE_UCA_COLLATIONS  */
 | |
| #endif /* HAVE_CHARSET_utf8mb4 */
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf16
 | |
|   add_compiled_collation(&my_charset_utf16_general_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_bin);
 | |
|   add_compiled_collation(&my_charset_utf16le_general_ci);
 | |
|   add_compiled_collation(&my_charset_utf16le_bin);
 | |
|   add_compiled_collation(&my_charset_utf16_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_nopad_bin);
 | |
|   add_compiled_collation(&my_charset_utf16le_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf16le_nopad_bin);
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
|   add_compiled_collation(&my_charset_utf16_unicode_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_german2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_icelandic_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_latvian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_romanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_slovenian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_polish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_estonian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_spanish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_swedish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_turkish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_czech_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_danish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_lithuanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_slovak_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_spanish2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_roman_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_persian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_esperanto_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_hungarian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_croatian_mysql561_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_sinhala_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_unicode_520_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_vietnamese_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_croatian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_myanmar_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_thai_520_w2);
 | |
|   add_compiled_collation(&my_charset_utf16_unicode_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf16_unicode_520_nopad_ci);
 | |
| #endif /* HAVE_UCA_COLLATIONS */
 | |
| #endif /* HAVE_CHARSET_utf16 */
 | |
| 
 | |
| 
 | |
| #ifdef HAVE_CHARSET_utf32
 | |
|   add_compiled_collation(&my_charset_utf32_general_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_bin);
 | |
|   add_compiled_collation(&my_charset_utf32_general_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_nopad_bin);
 | |
| #ifdef HAVE_UCA_COLLATIONS
 | |
|   add_compiled_collation(&my_charset_utf32_unicode_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_german2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_icelandic_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_latvian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_romanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_slovenian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_polish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_estonian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_spanish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_swedish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_turkish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_czech_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_danish_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_lithuanian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_slovak_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_spanish2_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_roman_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_persian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_esperanto_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_hungarian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_croatian_mysql561_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_sinhala_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_unicode_520_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_vietnamese_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_croatian_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_myanmar_uca_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_thai_520_w2);
 | |
|   add_compiled_collation(&my_charset_utf32_unicode_nopad_ci);
 | |
|   add_compiled_collation(&my_charset_utf32_unicode_520_nopad_ci);
 | |
| #endif /* HAVE_UCA_COLLATIONS */
 | |
| #endif /* HAVE_CHARSET_utf32 */
 | |
| 
 | |
|   /* Copy compiled charsets */
 | |
|   for (cs=compiled_charsets; cs->coll_name.str; cs++)
 | |
|     add_compiled_extra_collation((struct charset_info_st *) cs);
 | |
| 
 | |
|   /*
 | |
|     my_charset_loader_init_mysys() initializes
 | |
|     MY_CHARSET_LOADER::add_collation to the function
 | |
|     add_collation() defined in charset.c
 | |
|     Let's reset it to add_compiled_collation().
 | |
|   */
 | |
|   my_charset_loader_init_mysys(&loader);
 | |
|   loader.add_collation= add_compiled_collation;
 | |
| 
 | |
|   if (my_uca1400_collation_definitions_add(&loader))
 | |
|     return TRUE;
 | |
| 
 | |
|   if (mysql_uca0900_utf8mb4_collation_definitions_add(&loader))
 | |
|     return TRUE;
 | |
| 
 | |
|   if (mysql_utf8mb4_0900_bin_add(&loader))
 | |
|     return TRUE;
 | |
| 
 | |
|   return FALSE;
 | |
| }
 |