diff options
author | mh <mh@immerda.ch> | 2008-07-11 14:15:13 +0000 |
---|---|---|
committer | mh <mh@immerda.ch> | 2008-07-11 14:15:13 +0000 |
commit | 1c5d97675960ad98305121c775e2a5beae1b575e (patch) | |
tree | d126716bcdd2772bb5d565cebd5ad5cdf08514cd /files/config/my.cnf | |
parent | 3a8613ab9d7235109eda1a3d41e249fd2159a29a (diff) |
fixed merge regressions
Diffstat (limited to 'files/config/my.cnf')
-rw-r--r-- | files/config/my.cnf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/config/my.cnf b/files/config/my.cnf index b3c1f0b..e15efc3 100644 --- a/files/config/my.cnf +++ b/files/config/my.cnf @@ -1,5 +1,5 @@ [mysqld] -datadir=/var/lib/mysql/data +datadir=/var/lib/mysql log-bin=/var/lib/mysql socket=/var/lib/mysql/mysql.sock # Default to using old password format for compatibility with mysql 3.x |