From c701985fa8969e9c6d450673c628080f988a9340 Mon Sep 17 00:00:00 2001
From: Friedhelm Betz <betz@php.net>
Date: Fri, 29 Mar 2002 23:26:31 +0000
Subject: [PATCH] added ini-settings from config.xml to Runtime Config

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@75859 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/mysql.xml | 127 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 4 deletions(-)

diff --git a/functions/mysql.xml b/functions/mysql.xml
index d355d5b4e6..db1c761c73 100644
--- a/functions/mysql.xml
+++ b/functions/mysql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.103 $ -->
+<!-- $Revision: 1.104 $ -->
  <reference id="ref.mysql">
   <title>MySQL Functions</title>
   <titleabbrev>MySQL</titleabbrev>
@@ -44,9 +44,9 @@
     <title>Runtime Configuration</title>
     <para>
      The behaviour of the MySQL functions is affected by settings in the
-     global <link linkend="configuration">configuration</link> file.
+     global <link linkend="configuration.file">configuration file</link> &php.ini;.
      <table>
-      <title><link linkend="ini.sect.mysql">MySQL Configuration</link> Options</title>
+      <title>MySQL Configuration Options</title>
       <tgroup cols="3">
        <thead>
         <row>
@@ -96,12 +96,131 @@
          <entry>NULL</entry>
          <entry>PHP_INI_ALL</entry>
         </row>
-
        </tbody>
       </tgroup>
      </table>
      For further details and definition of the PHP_INI_* constants see
      <function>ini_set</function>.
+   </para>
+   <para>
+    Here is a short explanation of the configuration directives.
+    <variablelist>
+
+     <varlistentry id="ini.mysql.allow-persistent">
+      <term>
+       <parameter>mysql.allow_persistent</parameter>
+       <type>boolean</type>
+      </term>
+      <listitem>
+       <para>
+        Wether to allow
+        <link linkend="features.persistent-connections">persistent connections</link>
+        to MySQL.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+     <varlistentry id="ini.mysql.max-persistent">
+      <term>
+       <parameter>mysql.max_persistent</parameter>
+       <type>integer</type>
+      </term>
+      <listitem>
+       <para>
+        The maximum number of persistent MySQL connections per
+        process.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+     <varlistentry id="ini.mysql.max-links">
+      <term>
+       <parameter>mysql.max_links</parameter>
+       <type>integer</type>
+      </term>
+      <listitem>
+       <para>
+        The maximum number of MySQL connections per process, including
+        persistent connections.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="ini.mysql.default-port">
+      <term>
+       <parameter>mysql.default_port</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        The default TCP port number to use when connecting to
+        the database server if no other port is specified. If
+        no default is specified, the port will be obtained
+        from the <literal>MYSQL_TCP_PORT</literal> environment
+        variable, the <literal>mysql-tcp</literal> entry in
+        <filename>/etc/services</filename> or the compile-time
+        <literal>MYSQL_PORT</literal> constant, in that order. Win32
+        will only use the <literal>MYSQL_PORT</literal> constant.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+     <varlistentry id="ini.mysql.default-socket">
+      <term>
+       <parameter>mysql.default_socket</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        The default socket name to use when connecting to a local
+        database server if no other socket name is specified.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="ini.mysql.default-host">
+      <term>
+       <parameter>mysql.default_host</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        The default server host to use when connecting to the database
+        server if no other host is specified. Doesn't apply in
+        <link linkend="ini.safe-mode">safe mode</link>.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+     <varlistentry id="ini.mysql.default-user">
+      <term>
+       <parameter>mysql.default_user</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        The default user name to use when connecting to the database
+        server if no other name is specified. Doesn't apply in
+        <link linkend="ini.safe-mode">safe mode</link>.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+     <varlistentry id="ini.mysql.default-password">
+      <term>
+       <parameter>mysql.default_password</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        The default password to use when connecting to the database
+        server if no other password is specified. Doesn't apply in
+        <link linkend="ini.safe-mode">safe mode</link>.
+       </para>
+      </listitem>
+     </varlistentry>
+     
+    </variablelist>
     </para>
    </section>