enable_user_name_access_type must not affect DEFINER access type

Author: pufit

src/Access/Common/AccessRightsElement.cpp

@@ -156,6 +156,7 @@ void AccessRightsElement::formatONClause(WriteBuffer & buffer, bool hilite) cons
         /// If `enable_user_name_access_type` is set to false, we will dump `GRANT CREATE USER ON *` as `GRANT CREATE USER ON *.*`.
         /// This will allow us to run old replicas in the same cluster.
         if (access_flags.getParameterType() == AccessFlags::USER_NAME
+            && access_flags != AccessType::SET_DEFINER
             && !is_enabled_user_name_access_type)
         {
             if (!anyParameter())

tests/integration/test_enable_user_name_access_type/test.py

@@ -17,11 +17,12 @@ def test_startup_scripts():
         cluster.start()
         node.query("CREATE USER foobar")
         node.query("GRANT CREATE USER ON * TO foobar")
+        node.query("GRANT SET DEFINER ON * TO foobar")
         assert (
-                node.query(
+                sorted(node.query(
                     "SHOW GRANTS FOR foobar"
-                )
-                == "GRANT CREATE USER ON *.* TO foobar\n"
+                ).split('\n'))
+                == ["GRANT CREATE USER ON *.* TO foobar", "GRANT SET DEFINER ON * TO foobar"]
         )
         node.query("DROP USER foobar")
     finally: