From: Johannes Schlüter Date: Sun, 28 Jun 2009 15:21:19 +0000 (+0000) Subject: MFH: Add missing MySQL entries X-Git-Tag: php-5.3.0~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9fa89534c8ad60113787485640cc924303374a8;p=php MFH: Add missing MySQL entries --- diff --git a/php.ini-development b/php.ini-development index c7cd0b6a04..9de43775da 100644 --- a/php.ini-development +++ b/php.ini-development @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific location. +; 1. SAPI module specific locamystion. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) @@ -1047,6 +1047,16 @@ default_socket_timeout = 60 ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1133,10 +1143,18 @@ odbc.defaultbinmode = 1 ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1184,10 +1202,18 @@ mysql.trace_mode = Off [MySQLi] +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look @@ -1219,6 +1245,26 @@ mysqli.default_pw = ; Allow or prevent reconnect mysqli.reconnect = Off +[mysqlnd] +; Enable / Disable collection of general statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = On + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + [OCI8] ; Connection: Enables privileged connections using external @@ -1772,24 +1818,9 @@ soap.wsdl_cache_ttl=86400 ;ibase.timestampformat= ;ibase.dateformat= ;ibase.timeformat= -;mysqli.max_persistent= -;mysqli.allow_persistent= -;mysqli.allow_local_infile= -;mysqli.cache_size= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= -;pdo_mysql.default_socket= -;pdo_mysql.debug= -;pdo_mysql.cache_size= ;com.code_page= -;mysql.allow_local_infile= -;mysql.cache_size= -;mysqlnd.collect_statistics= -;mysqlnd.collect_memory_statistics= -;mysqlnd.debug= -;mysqlnd.net_cmd_buffer_size= -;mysqlnd.net_read_buffer_size= -;mysqlnd.log_mask= ;odbc.default_cursortype= ;session.encode_sources= ;ldap.max_links= diff --git a/php.ini-production b/php.ini-production index 26e5c9b901..1b700705f9 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1047,6 +1047,16 @@ default_socket_timeout = 60 ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1133,10 +1143,18 @@ odbc.defaultbinmode = 1 ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1184,10 +1202,26 @@ mysql.trace_mode = Off [MySQLi] +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look @@ -1219,6 +1253,26 @@ mysqli.default_pw = ; Allow or prevent reconnect mysqli.reconnect = Off +[mysqlnd] +; Enable / Disable collection of general statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = Off + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + [OCI8] ; Connection: Enables privileged connections using external @@ -1772,24 +1826,9 @@ soap.wsdl_cache_ttl=86400 ;ibase.timestampformat= ;ibase.dateformat= ;ibase.timeformat= -;mysqli.max_persistent= -;mysqli.allow_persistent= -;mysqli.allow_local_infile= -;mysqli.cache_size= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= -;pdo_mysql.default_socket= -;pdo_mysql.debug= -;pdo_mysql.cache_size= ;com.code_page= -;mysql.allow_local_infile= -;mysql.cache_size= -;mysqlnd.collect_statistics= -;mysqlnd.collect_memory_statistics= -;mysqlnd.debug= -;mysqlnd.net_cmd_buffer_size= -;mysqlnd.net_read_buffer_size= -;mysqlnd.log_mask= ;odbc.default_cursortype= ;session.encode_sources= ;ldap.max_links=