1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Sergei Golubchik
2018-05-11 13:12:18 +02:00
140 changed files with 2212 additions and 2446 deletions

View File

@ -3990,11 +3990,11 @@ bool is_stat_table(const LEX_CSTRING *db, LEX_CSTRING *table)
{
DBUG_ASSERT(db->str && table->str);
if (!cmp(db, &MYSQL_SCHEMA_NAME))
if (!my_strcasecmp(table_alias_charset, db->str, MYSQL_SCHEMA_NAME.str))
{
for (uint i= 0; i < STATISTICS_TABLES; i ++)
{
if (cmp(table, &stat_table_name[i]) == 0)
if (!my_strcasecmp(table_alias_charset, table->str, stat_table_name[i].str))
return true;
}
}