mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
MDEV-31340 Remove MY_COLLATION_HANDLER::strcasecmp()
This patch also fixes: MDEV-33050 Build-in schemas like oracle_schema are accent insensitive MDEV-33084 LASTVAL(t1) and LASTVAL(T1) do not work well with lower-case-table-names=0 MDEV-33085 Tables T1 and t1 do not work well with ENGINE=CSV and lower-case-table-names=0 MDEV-33086 SHOW OPEN TABLES IN DB1 -- is case insensitive with lower-case-table-names=0 MDEV-33088 Cannot create triggers in the database `MYSQL` MDEV-33103 LOCK TABLE t1 AS t2 -- alias is not case sensitive with lower-case-table-names=0 MDEV-33109 DROP DATABASE MYSQL -- does not drop SP with lower-case-table-names=0 MDEV-33110 HANDLER commands are case insensitive with lower-case-table-names=0 MDEV-33119 User is case insensitive in INFORMATION_SCHEMA.VIEWS MDEV-33120 System log table names are case insensitive with lower-cast-table-names=0 - Removing the virtual function strnncoll() from MY_COLLATION_HANDLER - Adding a wrapper function CHARSET_INFO::streq(), to compare two strings for equality. For now it calls strnncoll() internally. In the future it will turn into a virtual function. - Adding new accent sensitive case insensitive collations: - utf8mb4_general1400_as_ci - utf8mb3_general1400_as_ci They implement accent sensitive case insensitive comparison. The weight of a character is equal to the code point of its upper case variant. These collations use Unicode-14.0.0 casefolding data. The result of my_charset_utf8mb3_general1400_as_ci.strcoll() is very close to the former my_charset_utf8mb3_general_ci.strcasecmp() There is only a difference in a couple dozen rare characters, because: - the switch from "tolower" to "toupper" comparison, to make utf8mb3_general1400_as_ci closer to utf8mb3_general_ci - the switch from Unicode-3.0.0 to Unicode-14.0.0 This difference should be tolarable. See the list of affected characters in the MDEV description. Note, utf8mb4_general1400_as_ci correctly handles non-BMP characters! Unlike utf8mb4_general_ci, it does not treat all BMP characters as equal. - Adding classes representing names of the file based database objects: Lex_ident_db Lex_ident_table Lex_ident_trigger Their comparison collation depends on the underlying file system case sensitivity and on --lower-case-table-names and can be either my_charset_bin or my_charset_utf8mb3_general1400_as_ci. - Adding classes representing names of other database objects, whose names have case insensitive comparison style, using my_charset_utf8mb3_general1400_as_ci: Lex_ident_column Lex_ident_sys_var Lex_ident_user_var Lex_ident_sp_var Lex_ident_ps Lex_ident_i_s_table Lex_ident_window Lex_ident_func Lex_ident_partition Lex_ident_with_element Lex_ident_rpl_filter Lex_ident_master_info Lex_ident_host Lex_ident_locale Lex_ident_plugin Lex_ident_engine Lex_ident_server Lex_ident_savepoint Lex_ident_charset engine_option_value::Name - All the mentioned Lex_ident_xxx classes implement a method streq(): if (ident1.streq(ident2)) do_equal(); This method works as a wrapper for CHARSET_INFO::streq(). - Changing a lot of "LEX_CSTRING name" to "Lex_ident_xxx name" in class members and in function/method parameters. - Replacing all calls like system_charset_info->coll->strcasecmp(ident1, ident2) to ident1.streq(ident2) - Taking advantage of the c++11 user defined literal operator for LEX_CSTRING (see m_strings.h) and Lex_ident_xxx (see lex_ident.h) data types. Use example: const Lex_ident_column primary_key_name= "PRIMARY"_Lex_ident_column; is now a shorter version of: const Lex_ident_column primary_key_name= Lex_ident_column({STRING_WITH_LEN("PRIMARY")});
This commit is contained in:
@ -207,7 +207,7 @@ static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
|
||||
|
||||
static struct
|
||||
{
|
||||
const char *plugin_name;
|
||||
Lex_ident_plugin plugin_name;
|
||||
enum enum_plugin_load_option override;
|
||||
} override_plugin_load_policy[]={
|
||||
/*
|
||||
@ -226,10 +226,10 @@ static struct
|
||||
- yet disable explicitly a component needed for the functionality
|
||||
to work, by using '--skip-performance-schema' (the plugin)
|
||||
*/
|
||||
{ "performance_schema", PLUGIN_FORCE }
|
||||
{ "performance_schema"_Lex_ident_plugin, PLUGIN_FORCE }
|
||||
|
||||
/* we disable few other plugins by default */
|
||||
,{ "feedback", PLUGIN_OFF }
|
||||
,{ "feedback"_Lex_ident_plugin, PLUGIN_OFF }
|
||||
};
|
||||
|
||||
/* support for Services */
|
||||
@ -374,16 +374,16 @@ bool check_valid_path(const char *path, size_t len)
|
||||
|
||||
static void fix_dl_name(MEM_ROOT *root, LEX_CSTRING *dl)
|
||||
{
|
||||
const size_t so_ext_len= sizeof(SO_EXT) - 1;
|
||||
if (dl->length < so_ext_len ||
|
||||
my_strcasecmp(&my_charset_latin1, dl->str + dl->length - so_ext_len,
|
||||
SO_EXT))
|
||||
const Lex_ident_plugin so_ext(STRING_WITH_LEN(SO_EXT));
|
||||
if (dl->length < so_ext.length ||
|
||||
!so_ext.streq(Lex_cstring(dl->str + dl->length - so_ext.length,
|
||||
so_ext.length)))
|
||||
{
|
||||
char *s= (char*)alloc_root(root, dl->length + so_ext_len + 1);
|
||||
char *s= (char*)alloc_root(root, dl->length + so_ext.length + 1);
|
||||
memcpy(s, dl->str, dl->length);
|
||||
strcpy(s + dl->length, SO_EXT);
|
||||
dl->str= s;
|
||||
dl->length+= so_ext_len;
|
||||
dl->length+= so_ext.length;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1144,8 +1144,7 @@ static enum install_status plugin_add(MEM_ROOT *tmp_root, bool if_not_exists,
|
||||
tmp.plugin_dl->mariaversion == 0))
|
||||
continue; // unsupported plugin type
|
||||
|
||||
if (name->str && system_charset_info->strnncoll(name->str, name->length,
|
||||
tmp.name.str, tmp.name.length))
|
||||
if (name->str && !Lex_ident_plugin(*name).streq(tmp.name))
|
||||
continue; // plugin name doesn't match
|
||||
|
||||
if (!name->str &&
|
||||
@ -1634,7 +1633,9 @@ int plugin_init(int *argc, char **argv, int flags)
|
||||
|
||||
for (i= 0; i < MYSQL_MAX_PLUGIN_TYPE_NUM; i++)
|
||||
{
|
||||
if (my_hash_init(key_memory_plugin_mem_root, &plugin_hash[i], system_charset_info, 32, 0, 0,
|
||||
if (my_hash_init(key_memory_plugin_mem_root, &plugin_hash[i],
|
||||
Lex_ident_plugin::charset_info(),
|
||||
32, 0, 0,
|
||||
get_plugin_hash_key, NULL, HASH_UNIQUE))
|
||||
goto err;
|
||||
}
|
||||
@ -1667,21 +1668,20 @@ int plugin_init(int *argc, char **argv, int flags)
|
||||
}
|
||||
for (plugin= *builtins; plugin->info; plugin++)
|
||||
{
|
||||
Lex_ident_plugin tmp_plugin_name(Lex_cstring_strlen(plugin->name));
|
||||
if (opt_ignore_builtin_innodb &&
|
||||
!my_charset_latin1.strnncoll(plugin->name, 6, "InnoDB", 6))
|
||||
tmp_plugin_name.streq("InnoDB"_Lex_ident_plugin))
|
||||
continue;
|
||||
|
||||
bzero(&tmp, sizeof(tmp));
|
||||
tmp.plugin= plugin;
|
||||
tmp.name.str= (char *)plugin->name;
|
||||
tmp.name.length= strlen(plugin->name);
|
||||
tmp.name= tmp_plugin_name;
|
||||
tmp.state= 0;
|
||||
tmp.load_option= mandatory ? PLUGIN_FORCE : PLUGIN_ON;
|
||||
|
||||
for (i=0; i < array_elements(override_plugin_load_policy); i++)
|
||||
{
|
||||
if (!my_strcasecmp(&my_charset_latin1, plugin->name,
|
||||
override_plugin_load_policy[i].plugin_name))
|
||||
if (tmp_plugin_name.streq(override_plugin_load_policy[i].plugin_name))
|
||||
{
|
||||
tmp.load_option= override_plugin_load_policy[i].override;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user