1 |
snetram |
1.1 |
--- e-smith-mysql-2.0.0/root/etc/e-smith/templates/etc/my.cnf/010mysqld-log-error.fixLogging 2003-12-18 23:10:32.000000000 +0100 |
2 |
|
|
+++ e-smith-mysql-2.0.0/root/etc/e-smith/templates/etc/my.cnf/010mysqld-log-error 2009-02-23 11:35:51.000000000 +0100 |
3 |
|
|
@@ -1,18 +1 @@ |
4 |
|
|
-{ |
5 |
|
|
- # Check that log-error option is supported (mysql > 4.0.10) |
6 |
|
|
- # and save result in a package variable |
7 |
|
|
- my $mysqld = "/usr/libexec/mysqld"; |
8 |
|
|
- if (-f "/usr/sbin/mysqld") { |
9 |
|
|
- $mysqld = "/usr/sbin/mysqld"; |
10 |
|
|
- } |
11 |
|
|
- open (MYSQLD, "$mysqld --help |") |
12 |
|
|
- or return "# WARN: can't exec mysqld; skipping log-error setup"; |
13 |
|
|
- $LogError = grep {/log-error/} <MYSQLD>; |
14 |
|
|
- close MYSQLD; |
15 |
|
|
- if ($LogError) { |
16 |
|
|
- $OUT = "log-error=/var/log/mysqld.log"; |
17 |
|
|
- } |
18 |
|
|
- else { |
19 |
|
|
- $OUT = "# log-error not yet supported in our mysqld version"; |
20 |
|
|
- } |
21 |
|
|
-} |
22 |
|
|
+log-error=/var/log/mysqld.log |
23 |
|
|
--- e-smith-mysql-2.0.0/root/etc/e-smith/templates/etc/my.cnf/042log-error 2003-12-24 16:45:42.000000000 +0100 |
24 |
|
|
+++ /dev/null 2009-02-23 11:37:43.000000000 +0100 |
25 |
|
|
@@ -1,14 +0,0 @@ |
26 |
|
|
-{ |
27 |
|
|
- # This logging control is required for older versions of mysql (< 4.0.10) |
28 |
|
|
- # where logging is controlled by the safe_mysqld/mysqld_safe script. It |
29 |
|
|
- # should be moved to the [mysqld] section for newer versions (>= 4.0.10) |
30 |
|
|
- # where logging is controlled by the mysqld binary. |
31 |
|
|
- # Allow backwards compatibility for err-log (mysql < 4.0.? ) |
32 |
|
|
- # Use $LogError result from 010mysqld-log-error fragment |
33 |
|
|
- if ($LogError) { |
34 |
|
|
- $OUT = "# logging controlled in [mysqld] section for mysql >= 4.0.10"; |
35 |
|
|
- } |
36 |
|
|
- else { |
37 |
|
|
- $OUT = "err-log=/var/log/mysqld.log"; |
38 |
|
|
- } |
39 |
|
|
-} |