database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-07 08:26:21 +03:00
parent 38dda1f026 c7ba237793
commit 38d36b59f9
19 changed files with 569 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@ -2094,9 +2094,11 @@ class Grant_tables
some kind of updates to the mysql.% tables.
*/
Rpl_filter *rpl_filter= thd->system_thread_info.rpl_sql_info->rpl_filter;
if (rpl_filter->is_on() && !rpl_filter->tables_ok(0, tables))
{
thd->slave_expected_error= 0;
DBUG_RETURN(1);
}
}
DBUG_RETURN(0);
}