betz Fri Mar 29 10:31:37 2002 EDT
Modified files:
/phpdoc/en/chapters config.xml
Log:
correcting uodbc directives. changed uodbc.* to odbc.*
minor changes to MySQL directives
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.41 phpdoc/en/chapters/config.xml:1.42
--- phpdoc/en/chapters/config.xml:1.41 Thu Mar 28 12:16:34 2002
+++ phpdoc/en/chapters/config.xml Fri Mar 29 10:31:37 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
+<!-- $Revision: 1.42 $ -->
<chapter id="configuration">
<title>Configuration</title>
@@ -905,18 +905,6 @@
<title>MySQL Configuration Directives</title>
<variablelist>
- <varlistentry id="ini.mysql.allow-persistent">
- <term>
- <parameter>mysql.allow_persistent</parameter>
- <type>boolean</type>
- </term>
- <listitem>
- <para>
- Whether to allow persistent MySQL connections.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry id="ini.mysql.default-host">
<term>
<parameter>mysql.default_host</parameter>
@@ -925,7 +913,8 @@
<listitem>
<para>
The default server host to use when connecting to the database
- server if no other host is specified.
+ server if no other host is specified. Doesn't apply in
+ <link linkend="ini.safe-mode">safe mode</link>.
</para>
</listitem>
</varlistentry>
@@ -938,7 +927,8 @@
<listitem>
<para>
The default user name to use when connecting to the database
- server if no other name is specified.
+ server if no other name is specified. Doesn't apply in
+ <link linkend="ini.safe-mode">safe mode</link>.
</para>
</listitem>
</varlistentry>
@@ -951,7 +941,8 @@
<listitem>
<para>
The default password to use when connecting to the database
- server if no other password is specified.
+ server if no other password is specified. Doesn't apply in
+ <link linkend="ini.safe-mode">safe mode</link>.
</para>
</listitem>
</varlistentry>
@@ -987,6 +978,20 @@
</para>
</listitem>
</varlistentry>
+
+ <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>
@@ -1555,7 +1560,7 @@
<varlistentry id="ini.uodbc.default-db">
<term>
- <parameter>uodbc.default_db</parameter>
+ <parameter>odbc.default_db</parameter>
<type>string</type>
</term>
<listitem>
@@ -1569,7 +1574,7 @@
<varlistentry id="ini.uodbc.default-user">
<term>
- <parameter>uodbc.default_user</parameter>
+ <parameter>odbc.default_user</parameter>
<type>string</type>
</term>
<listitem>
@@ -1581,9 +1586,9 @@
</listitem>
</varlistentry>
- <varlistentry id="ini.uodbc.default-pw">
+ <varlistentry id="ini.odbc.default-pw">
<term>
- <parameter>uodbc.default_pw</parameter>
+ <parameter>odbc.default_pw</parameter>
<type>string</type>
</term>
<listitem>
@@ -1597,7 +1602,7 @@
<varlistentry id="ini.uodbc.allow-persistent">
<term>
- <parameter>uodbc.allow_persistent</parameter>
+ <parameter>odbc.allow_persistent</parameter>
<type>boolean</type>
</term>
<listitem>
@@ -1607,9 +1612,21 @@
</listitem>
</varlistentry>
+ <varlistentry id="ini.uodbc.check-persistent">
+ <term>
+ <parameter>odbc.check_persistent</parameter>
+ <type>boolean</type>
+ </term>
+ <listitem>
+ <para>
+ Check that a connection is still valid before reuse.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="ini.uodbc.max-persistent">
<term>
- <parameter>uodbc.max_persistent</parameter>
+ <parameter>odbc.max_persistent</parameter>
<type>integer</type>
</term>
<listitem>
@@ -1621,13 +1638,37 @@
<varlistentry id="ini.uodbc.max-links">
<term>
- <parameter>uodbc.max_links</parameter>
+ <parameter>odbc.max_links</parameter>
<type>integer</type>
</term>
<listitem>
<para>
The maximum number of ODBC connections per process, including
persistent connections.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="ini.uodbc.defaultlrl">
+ <term>
+ <parameter>odbc.defaultlrl</parameter>
+ <type>integer</type>
+ </term>
+ <listitem>
+ <para>
+ Handling of LONG fields. Specifies the number of bytes returned to variables.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="ini.uodbc.defaultbinmode">
+ <term>
+ <parameter>odbc.defaultbinmode</parameter>
+ <type>integer</type>
+ </term>
+ <listitem>
+ <para>
+ Handling of binary data.
</para>
</listitem>
</varlistentry>
