diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:47:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:47:20 +0300 |
| commit | 1985204044852f6be55453b3b843e81fd0fe1730 (patch) | |
| tree | ef186b5c3f0dcd78b25c28662003b7ec8957675d /sql/sql_acl.cc | |
| parent | 4318391346dfd3ebc43175aa24e880b0e74159d4 (diff) | |
| parent | 38d36b59f925dc19f5b8346b3e54bec782771967 (diff) | |
| download | mariadb-git-1985204044852f6be55453b3b843e81fd0fe1730.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 999f7d5b836..e4a929e8747 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -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); } |