diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py
index 86ea0b2..e4fad99 100644
--- a/plugins/module_utils/user.py
+++ b/plugins/module_utils/user.py
@@ -368,7 +368,7 @@ def user_delete(cursor, user, host, host_all, check_mode):
         hostnames = [host]
 
     for hostname in hostnames:
-        cursor.execute("DROP USER /*!50700 IF EXISTS */ /*M!100100 IF EXISTS */  %s@%s", (user, hostname))
+        cursor.execute("DROP USER /*!50708 IF EXISTS */ /*M!100103 IF EXISTS */  %s@%s", (user, hostname))
 
     return True
 
diff --git a/plugins/modules/mysql_db.py b/plugins/modules/mysql_db.py
index c2a6fd8..62df1cd 100644
--- a/plugins/modules/mysql_db.py
+++ b/plugins/modules/mysql_db.py
@@ -338,7 +338,7 @@ def db_delete(cursor, db):
     if not db:
         return False
     for each_db in db:
-        query = "DROP DATABASE %s" % mysql_quote_identifier(each_db, 'database')
+        query = "DROP DATABASE /*!50700 IF EXISTS */ /*M!100100 IF EXISTS */ %s" % mysql_quote_identifier(each_db, 'database')
         executed_commands.append(query)
         cursor.execute(query)
     return True
diff --git a/plugins/modules/mysql_role.py b/plugins/modules/mysql_role.py
index 159bcf0..f326cdc 100644
--- a/plugins/modules/mysql_role.py
+++ b/plugins/modules/mysql_role.py
@@ -741,7 +741,7 @@ class Role():
         if check_mode and self.exists:
             return True
 
-        self.cursor.execute('DROP ROLE /*!50700 IF EXISTS */ /*M!100100 IF EXISTS */ %s', (self.name,))
+        self.cursor.execute('/*M!100005 DROP ROLE */ /*M!100103 IF EXISTS */ /*M!100005 %s */', (self.name,))
         return True
 
     def update_members(self, users, check_mode=False, append_members=False,