386a5aa Rebase to 3.1.5

Authored and Committed by mschorm 4 years ago
    Rebase to 3.1.5
    
    Remove plugindir patch. Issue fixed by upstream:
    https://jira.mariadb.org/browse/MDEV-20569
    
        
file modified
+1 -0
file modified
+5 -5
file removed
-20
file modified
+1 -1