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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_acl.cc
View File

@ -10219,6 +10219,10 @@ static int handle_grant_table(THD *thd, const Grant_table_base& grant_table,
int result= 0;
int error;
TABLE *table= grant_table.table();
DBUG_ENTER("handle_grant_table");
if (!table)
DBUG_RETURN(0);
Field *host_field= table->field[0];
Field *user_field= table->field[which_table == USER_TABLE ||
which_table == PROXIES_PRIV_TABLE ? 1 : 2];
@ -10228,7 +10232,6 @@ static int handle_grant_table(THD *thd, const Grant_table_base& grant_table,
const char *user;
uchar user_key[MAX_KEY_LENGTH];
uint key_prefix_length;
DBUG_ENTER("handle_grant_table");
if (which_table == ROLES_MAPPING_TABLE)
{