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 | |
| parent | 3a8613ab9d7235109eda1a3d41e249fd2159a29a (diff) | |
fixed merge regressions
Diffstat (limited to 'files')
| -rw-r--r-- | files/backup/mysql_backup.cron | 2 | ||||
| -rw-r--r-- | files/config/my.cnf | 2 | ||||
| -rw-r--r-- | files/config/my.cnf.Gentoo | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/files/backup/mysql_backup.cron b/files/backup/mysql_backup.cron index 375d910..fed14fb 100644 --- a/files/backup/mysql_backup.cron +++ b/files/backup/mysql_backup.cron @@ -1 +1 @@ -00 01 * * * root /usr/bin/mysqldump --all-databases --all | gzip > /var/lib/mysql/mysqldump.sql.gz && chmod 600 /var/lib/mysql/data/mysqldump.sql.gz +00 01 * * * root /usr/bin/mysqldump --all-databases --all | gzip > /var/lib/mysql/mysqldump.sql.gz && chmod 600 /var/lib/mysql/mysqldump.sql.gz 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 diff --git a/files/config/my.cnf.Gentoo b/files/config/my.cnf.Gentoo index de2e2b7..63ce645 100644 --- a/files/config/my.cnf.Gentoo +++ b/files/config/my.cnf.Gentoo @@ -51,7 +51,7 @@ socket = /var/run/mysqld/mysqld.sock pid-file = /var/run/mysqld/mysqld.pid log-error = /var/log/mysql/mysqld.err basedir = /usr -datadir = /var/lib/mysql/data +datadir = /var/lib/mysql log-bin = /var/lib/mysql skip-locking key_buffer = 16M |