- skip-locking is enabled upstream for linux platform

Changed files:
    mysqld.conf -> 1.26

diff --git a/mysqld.conf b/mysqld.conf
index 0e542508cc1c66e01d6ec4f9b2808ff38725ad84..3d6399964c7a1d9e019d14f1609cc2b721eb4f39 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -22,7 +22,7 @@ user        = mysql
 ;old-passwords
 
 ; Don't use system locking
-;skip-locking
+skip-locking
 
 ; Don't allow connections over the network by default
 skip-networking