mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
fd247cc21f
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")});
108 lines
3.4 KiB
C++
108 lines
3.4 KiB
C++
/*
|
|
Copyright (c) 2009, 2020, MariaDB Corporation
|
|
|
|
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 "mariadb.h"
|
|
#include "sql_acl.h"
|
|
|
|
|
|
bool Grant_privilege::add_column_privilege(THD *thd,
|
|
const Lex_ident_sys &name,
|
|
privilege_t which_grant)
|
|
{
|
|
String *new_str= new (thd->mem_root) String((const char*) name.str,
|
|
name.length,
|
|
system_charset_info);
|
|
if (unlikely(new_str == NULL))
|
|
return true;
|
|
List_iterator <LEX_COLUMN> iter(m_columns);
|
|
class LEX_COLUMN *point;
|
|
while ((point=iter++))
|
|
{
|
|
if (Lex_ident_column::charset_info()->streq(point->column.to_lex_cstring(),
|
|
name))
|
|
break;
|
|
}
|
|
m_column_privilege_total|= which_grant;
|
|
if (point)
|
|
{
|
|
point->rights |= which_grant;
|
|
return false;
|
|
}
|
|
|
|
LEX_COLUMN *col= new (thd->mem_root) LEX_COLUMN(*new_str, which_grant);
|
|
if (unlikely(col == NULL))
|
|
return true;
|
|
return m_columns.push_back(col, thd->mem_root);
|
|
}
|
|
|
|
|
|
bool Grant_privilege::add_column_list_privilege(THD *thd,
|
|
List<Lex_ident_sys> &list,
|
|
privilege_t privilege)
|
|
{
|
|
Lex_ident_sys *col;
|
|
List_iterator<Lex_ident_sys> it(list);
|
|
while ((col= it++))
|
|
{
|
|
if (add_column_privilege(thd, *col, privilege))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
privilege_t Grant_object_name::all_privileges_by_type() const
|
|
{
|
|
switch (m_type) {
|
|
case STAR: return DB_ACLS & ~GRANT_ACL;
|
|
case IDENT_STAR: return DB_ACLS & ~GRANT_ACL;
|
|
case STAR_STAR: return GLOBAL_ACLS & ~GRANT_ACL;
|
|
case TABLE_IDENT: return TABLE_ACLS & ~GRANT_ACL;
|
|
}
|
|
return NO_ACL;
|
|
}
|
|
|
|
|
|
bool Grant_privilege::set_object_name(THD *thd,
|
|
const Grant_object_name &ident,
|
|
SELECT_LEX *sel,
|
|
privilege_t with_grant_option)
|
|
{
|
|
DBUG_ASSERT(!m_all_privileges || !m_columns.elements);
|
|
|
|
m_db= ident.m_db;
|
|
if (m_all_privileges)
|
|
m_object_privilege= ident.all_privileges_by_type();
|
|
m_object_privilege|= with_grant_option;
|
|
switch (ident.m_type)
|
|
{
|
|
case Lex_grant_object_name::STAR:
|
|
case Lex_grant_object_name::IDENT_STAR:
|
|
case Lex_grant_object_name::STAR_STAR:
|
|
if (!m_all_privileges && m_columns.elements)
|
|
{
|
|
// e.g. GRANT SELECT (a) ON db.*
|
|
my_error(ER_ILLEGAL_GRANT_FOR_TABLE, MYF(0));
|
|
return true;
|
|
}
|
|
return false;
|
|
case Lex_grant_object_name::TABLE_IDENT:
|
|
m_db= ident.m_table_ident->db;
|
|
return !sel->add_table_to_list(thd, ident.m_table_ident,
|
|
NULL, TL_OPTION_UPDATING);
|
|
}
|
|
return false; // Make gcc happy
|
|
}
|