diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:56:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:56:06 +0300 |
| commit | 0c0b697ae327e75388572da81a49b18640193ba5 (patch) | |
| tree | 15525ba618334046546019f74a9b450474279b39 /sql/sql_acl.cc | |
| parent | 5fdbb3a72ee5a532676242096aa92c6a3c6e4073 (diff) | |
| parent | 1985204044852f6be55453b3b843e81fd0fe1730 (diff) | |
| download | mariadb-git-0c0b697ae327e75388572da81a49b18640193ba5.tar.gz | |
Merge 10.6 into 10.7
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 6e26ec996e7..d4d69345689 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); } |