diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 10:22:36 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 11:15:29 +0300 |
| commit | f0a40cb757000a83e37185d45423280351f3aa69 (patch) | |
| tree | 99b337b288eef78779ceae5da73687203845f4bf | |
| parent | ae475e036e147fa78d35500aa10dc7c52c05a7d9 (diff) | |
| download | mariadb-10.1-f0a40cb757000a83e37185d45423280351f3aa69.tar.gz | |
Add debian/patches/MDEV-12366.patch
| -rw-r--r-- | debian/patches/MDEV-12366.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/MDEV-12366.patch b/debian/patches/MDEV-12366.patch new file mode 100644 index 0000000..524ca58 --- /dev/null +++ b/debian/patches/MDEV-12366.patch @@ -0,0 +1,17 @@ +Description: Fix FLUSH PRIVILEGES can miss some roles +Bug: https://jira.mariadb.org/browse/MDEV-12366 +diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc +index cb4c3cb1049..bf6a7b847f5 100644 +--- a/sql/sql_acl.cc ++++ b/sql/sql_acl.cc +@@ -6754,9 +6754,7 @@ static my_bool role_propagate_grants_action(void *ptr, + if (role->counter) + return 0; + +- mysql_mutex_assert_owner(&acl_cache->lock); +- PRIVS_TO_MERGE data= { PRIVS_TO_MERGE::ALL, 0, 0 }; +- traverse_role_graph_up(role, &data, NULL, merge_role_privileges); ++ propagate_role_grants(role, PRIVS_TO_MERGE::ALL, NULL, NULL); + return 0; + } + diff --git a/debian/patches/series b/debian/patches/series index 8ca8a6b..1d43102 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,4 +21,5 @@ mips-innobase-atomic.patch fix-FTBFS-on-GNU-Hurd.patch mytop-merge_src:mytop_improvements.patch Add_default_ExecStartPre_to_mariadb@.service.patch +MDEV-12366.patch dyson.patch |