Magellan Linux

Annotation of /trunk/mysql5/patches/mysql5-5.5.15-cnf-defaults.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1525 - (hide annotations) (download)
Fri Sep 9 11:36:43 2011 UTC (12 years, 8 months ago) by niro
File size: 4416 byte(s)
-re-diffed for 5.5.15
1 niro 1525 diff -Naur mysql-5.5.15/support-files/my-huge.cnf.sh mysql-5.5.15-magellan/support-files/my-huge.cnf.sh
2     --- mysql-5.5.15/support-files/my-huge.cnf.sh 2011-07-13 21:09:03.000000000 +0200
3     +++ mysql-5.5.15-magellan/support-files/my-huge.cnf.sh 2011-09-09 15:08:19.000000000 +0200
4     @@ -23,8 +23,13 @@
5    
6     # The MySQL server
7     [mysqld]
8     +user = mysql
9     port = @MYSQL_TCP_PORT@
10     socket = @MYSQL_UNIX_ADDR@
11     +pid-file = /var/run/mysqld/mysqld.pid
12     +log-error = /var/log/mysql/mysqld.err
13     +language = /usr/share/mysql/english
14     +datadir = /var/lib/mysql
15     skip-external-locking
16     key_buffer_size = 384M
17     max_allowed_packet = 1M
18     @@ -45,6 +50,7 @@
19     # (via the "enable-named-pipe" option) will render mysqld useless!
20     #
21     #skip-networking
22     +bind-address = 127.0.0.1
23    
24     # Replication Master Server (default)
25     # binary logging is required for replication
26     diff -Naur mysql-5.5.15/support-files/my-innodb-heavy-4G.cnf.sh mysql-5.5.15-magellan/support-files/my-innodb-heavy-4G.cnf.sh
27     --- mysql-5.5.15/support-files/my-innodb-heavy-4G.cnf.sh 2011-07-13 21:09:03.000000000 +0200
28     +++ mysql-5.5.15-magellan/support-files/my-innodb-heavy-4G.cnf.sh 2011-09-09 15:09:29.000000000 +0200
29     @@ -42,8 +42,13 @@
30     [mysqld]
31    
32     # generic configuration options
33     +user = mysql
34     port = @MYSQL_TCP_PORT@
35     socket = @MYSQL_UNIX_ADDR@
36     +pid-file = /var/run/mysqld/mysqld.pid
37     +log-error = /var/log/mysql/mysqld.err
38     +language = /usr/share/mysql/english
39     +datadir = /var/lib/mysql
40    
41     # back_log is the number of connections the operating system can keep in
42     # the listen queue, before the MySQL connection manager thread has
43     @@ -61,6 +66,7 @@
44     # Note that using this option without enabling named pipes on Windows
45     # (via the "enable-named-pipe" option) will render mysqld useless!
46     #skip-networking
47     +bind-address = 127.0.0.1
48    
49     # The maximum amount of concurrent sessions the MySQL server will
50     # allow. One of these connections will be reserved for a user with
51     diff -Naur mysql-5.5.15/support-files/my-large.cnf.sh mysql-5.5.15-magellan/support-files/my-large.cnf.sh
52     --- mysql-5.5.15/support-files/my-large.cnf.sh 2011-07-13 21:09:03.000000000 +0200
53     +++ mysql-5.5.15-magellan/support-files/my-large.cnf.sh 2011-09-09 15:10:38.000000000 +0200
54     @@ -23,8 +23,13 @@
55    
56     # The MySQL server
57     [mysqld]
58     +user = mysql
59     port = @MYSQL_TCP_PORT@
60     socket = @MYSQL_UNIX_ADDR@
61     +pid-file = /var/run/mysqld/mysqld.pid
62     +log-error = /var/log/mysql/mysqld.err
63     +language = /usr/share/mysql/english
64     +datadir = /var/lib/mysql
65     skip-external-locking
66     key_buffer_size = 256M
67     max_allowed_packet = 1M
68     @@ -45,6 +50,7 @@
69     # (via the "enable-named-pipe" option) will render mysqld useless!
70     #
71     #skip-networking
72     +bind-address = 127.0.0.1
73    
74     # Replication Master Server (default)
75     # binary logging is required for replication
76     diff -Naur mysql-5.5.15/support-files/my-medium.cnf.sh mysql-5.5.15-magellan/support-files/my-medium.cnf.sh
77     --- mysql-5.5.15/support-files/my-medium.cnf.sh 2011-07-13 21:09:03.000000000 +0200
78     +++ mysql-5.5.15-magellan/support-files/my-medium.cnf.sh 2011-09-09 15:11:34.000000000 +0200
79     @@ -24,8 +24,13 @@
80    
81     # The MySQL server
82     [mysqld]
83     +user = mysql
84     port = @MYSQL_TCP_PORT@
85     socket = @MYSQL_UNIX_ADDR@
86     +pid-file = /var/run/mysqld/mysqld.pid
87     +log-error = /var/log/mysql/mysqld.err
88     +language = /usr/share/mysql/english
89     +datadir = /var/lib/mysql
90     skip-external-locking
91     key_buffer_size = 16M
92     max_allowed_packet = 1M
93     @@ -43,6 +48,7 @@
94     # (via the "enable-named-pipe" option) will render mysqld useless!
95     #
96     #skip-networking
97     +bind-address = 127.0.0.1
98    
99     # Replication Master Server (default)
100     # binary logging is required for replication
101     diff -Naur mysql-5.5.15/support-files/my-small.cnf.sh mysql-5.5.15-magellan/support-files/my-small.cnf.sh
102     --- mysql-5.5.15/support-files/my-small.cnf.sh 2011-07-13 21:09:03.000000000 +0200
103     +++ mysql-5.5.15-magellan/support-files/my-small.cnf.sh 2011-09-09 15:12:25.000000000 +0200
104     @@ -24,8 +24,13 @@
105    
106     # The MySQL server
107     [mysqld]
108     +user = mysql
109     port = @MYSQL_TCP_PORT@
110     socket = @MYSQL_UNIX_ADDR@
111     +pid-file = /var/run/mysqld/mysqld.pid
112     +log-error = /var/log/mysql/mysqld.err
113     +language = /usr/share/mysql/english
114     +datadir = /var/lib/mysql
115     skip-external-locking
116     key_buffer_size = 16K
117     max_allowed_packet = 1M
118     @@ -43,6 +48,8 @@
119     # (using the "enable-named-pipe" option) will render mysqld useless!
120     #
121     #skip-networking
122     +bind-address = 127.0.0.1
123     +
124     server-id = 1
125    
126     # Uncomment the following if you want to log updates