]>
Commit | Line | Data |
---|---|---|
748cf17d ER |
1 | --- php-5.2.4/php.ini~ 2008-09-23 14:06:04.000000000 +0300 |
2 | +++ php-5.2.4/php.ini 2008-10-08 01:34:12.575347747 +0300 | |
3 | @@ -749,6 +749,9 @@ | |
4 | ; Maximum time (in seconds) for connect timeout. -1 means no limit | |
5 | mysql.connect_timeout = 60 | |
6 | ||
7 | +; The name of the character set to use as the default character set. | |
8 | +;mysql.connect_charset=utf8 | |
9 | + | |
10 | ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and | |
11 | ; SQL-Errors will be displayed. | |
12 | mysql.trace_mode = Off | |
13 | @@ -768,6 +771,9 @@ | |
14 | ; MySQL defaults. | |
15 | mysqli.default_socket = | |
16 | ||
17 | +; The name of the character set to use as the default character set. | |
18 | +;mysqli.connect_charset=utf8 | |
19 | + | |
20 | ; Default host for mysql_connect() (doesn't apply in safe mode). | |
21 | mysqli.default_host = | |
22 | ||
23 | @@ -784,6 +790,10 @@ | |
24 | ; Allow or prevent reconnect | |
25 | mysqli.reconnect = Off | |
26 | ||
27 | +[pdo_mysql] | |
28 | +; The name of the character set to use as the default character set. | |
29 | +;pdo_mysql.connect_charset=utf8 | |
30 | + | |
31 | [mSQL] | |
32 | ; Allow or prevent persistent links. | |
33 | msql.allow_persistent = On |